Remove option to choose different agent socket path

Resolves #19

Signed-off-by: Marco Franssen <[email protected]>

charts/spire/charts/spire-agent/README.md

@@ -29,7 +29,6 @@ A Helm chart to install the SPIRE agent.
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `""` |  |
-| socketPath | string | `"/run/spire/agent-sockets/spire-agent.sock"` |  |
 | trustDomain | string | `"example.org"` |  |
 | waitForIt.image.pullPolicy | string | `"IfNotPresent"` |  |
 | waitForIt.image.registry | string | `"cgr.dev"` |  |

charts/spire/charts/spire-agent/templates/configmap.yaml

@@ -10,7 +10,7 @@ data:
       log_level = {{ .Values.logLevel | quote }}
       server_address = "{{ .Release.Name }}-server"
       server_port = {{ .Values.server.port | quote }}
-      socket_path = {{ .Values.socketPath | quote }}
+      socket_path = {{ include "spire.agent-socket-path" . | quote }}
       trust_bundle_path = "/run/spire/bundle/bundle.crt"
       trust_domain = {{ .Values.trustDomain | quote }}
     }

charts/spire/charts/spire-agent/templates/daemonset.yaml

@@ -51,7 +51,7 @@ spec:
               mountPath: /run/spire/bundle
               readOnly: true
             - name: spire-agent-socket-dir
-              mountPath: {{ dir .Values.socketPath }}
+              mountPath: {{ include "spire.agent-socket-path" . | dir }}
               readOnly: false
             - name: spire-token
               mountPath: /var/run/secrets/tokens
@@ -89,5 +89,5 @@ spec:
                 audience: spire-server
         - name: spire-agent-socket-dir
           hostPath:
-            path: {{ dir .Values.socketPath }}
+            path: {{ include "spire.agent-socket-path" . | dir }}
             type: DirectoryOrCreate

charts/spire/charts/spire-agent/values.yaml

@@ -53,7 +53,6 @@ nodeSelector:
   kubernetes.io/arch: amd64
 
 logLevel: info
-socketPath: /run/spire/agent-sockets/spire-agent.sock
 clusterName: example-cluster
 trustDomain: example.org