Fix agent connectivity if deployed with different name

e.g. if deploying with spire-65de556ac Signed-off-by: Marco Franssen <[email protected]> Signed-off-by: Marco Franssen <[email protected]>
2023-02-18 13:04:12 +01:00
parent 9921d1df40
commit 016e8336d0
6 changed files with 7 additions and 5 deletions
@@ -23,7 +23,6 @@ A Helm chart to install the SPIRE agent.
 | podSecurityContext | object | `{}` |  |
 | resources | object | `{}` |  |
 | securityContext | object | `{}` |  |
-| server.host | string | `"spire-server"` |  |
 | server.port | int | `8081` |  |
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
@@ -72,3 +72,7 @@ Create the name of the service account to use
 {{- printf "%s/%s" .image.registry .image.repository -}}
 {{- end -}}
 {{- end }}
+
+{{- define "spire-server-service" -}}
+{{ include "spire-agent.fullname" . | trimSuffix "-agent" }}-server
+{{- end }}
@@ -8,7 +8,7 @@ data:
    agent {
      data_dir = "/run/spire"
      log_level = {{ .Values.logLevel | quote }}
-      server_address = {{ .Values.server.host | quote }}
+      server_address = {{ (include "spire-server-service" .) | quote }}
      server_port = {{ .Values.server.port | quote }}
      socket_path = {{ .Values.socketPath | quote }}
      trust_bundle_path = "/run/spire/bundle/bundle.crt"
@@ -35,7 +35,7 @@ spec:
          # from https://github.com/vishnubob/wait-for-it
          image: {{ template "spire-agent.image" .Values.waitForIt }}
          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:
            {{- toYaml .Values.waitForIt.resources | nindent 12 }}
      containers:
@@ -60,7 +60,6 @@ trustDomain: example.org
 bundleConfigMap: spire-bundle

 server:
-  host: spire-server
  port: 8081

 waitForIt:
@@ -40,7 +40,7 @@ data:
        plugin_data {
          clusters = {
            {{ .Values.clusterName | quote }} = {
-              service_account_allow_list = ["{{ .Release.Namespace }}:spire-agent"]
+              service_account_allow_list = ["{{ .Release.Namespace }}:{{ .Release.Name }}-agent"]
            }
          }
        }