Make socketPaths configurable

Signed-off-by: Marco Franssen <[email protected]> Signed-off-by: Marco Franssen <[email protected]>
2023-02-18 13:04:06 +01:00
parent c010d6a4b0
commit 83c3e45e93
7 changed files with 11 additions and 7 deletions
@@ -1,4 +1,4 @@
 1. Get the currently registered SPIFFE entries from the server:

  kubectl exec -n {{ .Release.Namespace }} {{ include "spire.fullname" . }}-server-0 -c spire-server -- \
-    bin/spire-server entry show -socketPath /run/spire/server-sockets/registration.sock
+    bin/spire-server entry show -socketPath {{ .Values.server.config.socketPath }}
@@ -7,10 +7,10 @@ data:
  agent.conf: |
    agent {
      data_dir = "/run/spire"
-      log_level = "{{ .Values.agent.config.logLevel }}"
+      log_level = {{ .Values.agent.config.logLevel | quote }}
      server_address = "{{ include "spire.fullname" . }}-server"
-      server_port = "{{ .Values.server.service.port }}"
-      socket_path = "/run/spire/agent-sockets/spire-agent.sock"
+      server_port = {{ .Values.server.service.port | quote }}
+      socket_path = {{ .Values.agent.config.socketPath | quote }}
      trust_bundle_path = "/run/spire/bundle/bundle.crt"
      trust_domain = {{ .Values.spire.trustDomain | quote }}
    }
@@ -29,7 +29,7 @@ data:
    {{- end }}

    workload_api {
-      socket_path = "/spiffe-workload-api/spire-agent.sock"
+      socket_path = "/spiffe-workload-api/{{ splitList "/" .Values.agent.config.socketPath | last }}"
      trust_domain = "{{ .Values.spire.trustDomain }}"
    }

@@ -8,7 +8,7 @@ data:
    server {
      bind_address = "0.0.0.0"
      bind_port = "8081"
-      socket_path = "/run/spire/server-sockets/spire-server.sock"
+      socket_path = {{ .Values.server.config.socketPath | quote }}
      trust_domain = {{ .Values.spire.trustDomain | quote }}
      data_dir = "/run/spire/data"
      log_level = "{{ .Values.server.config.logLevel }}"
@@ -9,6 +9,6 @@ data:
    mode            = "reconcile"
    trust_domain    = {{ .Values.spire.trustDomain | quote }}
    cluster         = {{ .Values.spire.clusterName | quote }}
-    server_address  = "unix:///run/spire/server-sockets/spire-server.sock"
+    server_address  = "unix://{{ .Values.server.config.socketPath }}"
    leader_election = true
    metrics_addr    = "0.0.0.0:18080"