panxiao81/helm-charts-hardened
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix agent connectivity if deployed with different name

Browse Source 
e.g. if deploying with spire-65de556ac

Signed-off-by: Marco Franssen <[email protected]>
Signed-off-by: Marco Franssen <[email protected]>
This commit is contained in:
Marco Franssen
2023-02-18 13:04:12 +01:00
committed by Marco Franssen
parent 9921d1df40
commit 016e8336d0
6 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/spire/charts/spire-agent/README.md
-1
View File
@@ -23,7 +23,6 @@ A Helm chart to install the SPIRE agent.
| podSecurityContext | object | `{}` | | | podSecurityContext | object | `{}` | |
| resources | object | `{}` | | | resources | object | `{}` | |
| securityContext | object | `{}` | | | securityContext | object | `{}` | |
| server.host | string | `"spire-server"` | |
| server.port | int | `8081` | | | server.port | int | `8081` | |
| serviceAccount.annotations | object | `{}` | | | serviceAccount.annotations | object | `{}` | |
| serviceAccount.create | bool | `true` | | | serviceAccount.create | bool | `true` | |
charts/spire/charts/spire-agent/templates/_helpers.tpl
+4
View File
@@ -72,3 +72,7 @@ Create the name of the service account to use
{{- printf "%s/%s" .image.registry .image.repository -}} {{- printf "%s/%s" .image.registry .image.repository -}}
{{- end -}} {{- end -}}
{{- end }} {{- end }}
{{- define "spire-server-service" -}}
{{ include "spire-agent.fullname" . | trimSuffix "-agent" }}-server
{{- end }}
charts/spire/charts/spire-agent/templates/configmap.yaml
+1 -1
View File
@@ -8,7 +8,7 @@ data:
agent { agent {
data_dir = "/run/spire" data_dir = "/run/spire"
log_level = {{ .Values.logLevel | quote }} log_level = {{ .Values.logLevel | quote }}
server_address = {{ .Values.server.host | quote }} server_address = {{ (include "spire-server-service" .) | quote }}
server_port = {{ .Values.server.port | quote }} server_port = {{ .Values.server.port | quote }}
socket_path = {{ .Values.socketPath | quote }} socket_path = {{ .Values.socketPath | quote }}
trust_bundle_path = "/run/spire/bundle/bundle.crt" trust_bundle_path = "/run/spire/bundle/bundle.crt"
charts/spire/charts/spire-agent/templates/daemonset.yaml
+1 -1
View File
@@ -35,7 +35,7 @@ spec:
# from https://github.com/vishnubob/wait-for-it # from https://github.com/vishnubob/wait-for-it
image: {{ template "spire-agent.image" .Values.waitForIt }} image: {{ template "spire-agent.image" .Values.waitForIt }}
imagePullPolicy: {{ .Values.waitForIt.image.pullPolicy }} imagePullPolicy: {{ .Values.waitForIt.image.pullPolicy }}
args: ["-t", "30", "-h", {{ .Values.server.host | quote }}, "-p", {{ .Values.server.port | quote }}] args: ["-t", "30", "-h", "{{ .Release.Name }}-server", "-p", {{ .Values.server.port | quote }}]
resources: resources:
{{- toYaml .Values.waitForIt.resources | nindent 12 }} {{- toYaml .Values.waitForIt.resources | nindent 12 }}
containers: containers:
charts/spire/charts/spire-agent/values.yaml
-1
View File
@@ -60,7 +60,6 @@ trustDomain: example.org
bundleConfigMap: spire-bundle bundleConfigMap: spire-bundle
server: server:
host: spire-server
port: 8081 port: 8081
waitForIt: waitForIt:
charts/spire/charts/spire-server/templates/configmap.yaml
+1 -1
View File
@@ -40,7 +40,7 @@ data:
plugin_data { plugin_data {
clusters = { clusters = {
{{ .Values.clusterName | quote }} = { {{ .Values.clusterName | quote }} = {
service_account_allow_list = ["{{ .Release.Namespace }}:spire-agent"] service_account_allow_list = ["{{ .Release.Namespace }}:{{ .Release.Name }}-agent"]
} }
} }
} }