Remove option to choose different agent socket path

Resolves #19 Signed-off-by: Marco Franssen <[email protected]>
2023-02-18 13:23:36 +01:00
parent 50846ebe9a
commit 99d32050ba
13 changed files with 16 additions and 19 deletions
@@ -10,7 +10,6 @@ A Helm chart to install the SPIFFE CSI driver.

 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| agentSocketPath | string | `"/run/spire/agent-sockets/spire-agent.sock"` |  |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"ghcr.io"` |  |
@@ -96,11 +96,11 @@ spec:
      volumes:
        - name: spire-agent-sockets
          hostPath:
-            path: {{ dir .Values.agentSocketPath }}
+            path: {{ include "spire.agent-socket-path" . | dir }}
            type: DirectoryOrCreate
        - name: spire-agent-socket-dir
          hostPath:
-            path: {{ dir .Values.agentSocketPath }}
+            path: {{ include "spire.agent-socket-path" . | dir }}
            type: DirectoryOrCreate
        # This volume is where the socket for kubelet->driver communication lives
        - name: spiffe-csi-socket-dir
@@ -63,5 +63,3 @@ nodeDriverRegistrar:
    # limits:
    #   cpu: 100m
    #   memory: 64Mi
-
-agentSocketPath: /run/spire/agent-sockets/spire-agent.sock
@@ -11,7 +11,6 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
-| agentSocketPath | string | `"/run/spire/agent-sockets/spire-agent.sock"` |  |
 | autoscaling.enabled | bool | `false` |  |
 | autoscaling.maxReplicas | int | `5` |  |
 | autoscaling.minReplicas | int | `1` |  |
@@ -30,7 +30,7 @@ data:
    {{- end }}

    workload_api {
-      socket_path = "/spiffe-workload-api/{{ splitList "/" .Values.agentSocketPath | last }}"
+      socket_path = "/spiffe-workload-api/{{ include "spire.agent-socket-path" . | splitList "/" | last }}"
      trust_domain = "{{ .Values.trustDomain }}"
    }

@@ -109,5 +109,4 @@ tolerations: []

 affinity: {}

-agentSocketPath: /run/spire/agent-sockets/spire-agent.sock
 trustDomain: "example.org"
@@ -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"` |  |
@@ -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 }}
    }
@@ -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
@@ -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