Helm chart improvements

Signed-off-by: Tim Ramlot <[email protected]>

deploy/charts/csi-driver-spiffe/README.md

@@ -30,8 +30,8 @@ cert-manager csi-driver-spiffe is a CSI plugin for Kubernetes which transparentl
 | app.approver.replicaCount | int | `1` | Number of replicas of the approver to run. |
 | app.approver.signerName | string | `"clusterissuers.cert-manager.io/*"` | The signer name that csi-driver-spiffe approver will be given permission to approve and deny. CertificateRequests referencing this signer name can be processed by the SPIFFE approver. See: https://cert-manager.io/docs/concepts/certificaterequest/#approval |
 | app.certificateRequestDuration | string | `"1h"` | Duration requested for requested certificates. |
-| app.driver | object | `{"csiDataDir":"/tmp/cert-manager-csi-driver","livenessProbe":{"port":9809},"livenessProbeImage":{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/sig-storage/livenessprobe","tag":"v2.9.0"},"nodeDriverRegistrarImage":{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/sig-storage/csi-node-driver-registrar","tag":"v2.7.0"},"resources":{},"sourceCABundle":null,"volumeFileName":{"ca":"ca.crt","cert":"tls.crt","key":"tls.key"},"volumeMounts":[],"volumes":[]}` | Options for CSI driver |
-| app.driver.csiDataDir | string | `"/tmp/cert-manager-csi-driver"` | Configures the hostPath directory that the driver will write and mount volumes from. |
+| app.driver | object | `{"csiDataDir":"/tmp/cert-manager-csi-driver-spiffe","livenessProbe":{"port":9809},"livenessProbeImage":{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/sig-storage/livenessprobe","tag":"v2.9.0"},"nodeDriverRegistrarImage":{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/sig-storage/csi-node-driver-registrar","tag":"v2.7.0"},"resources":{},"sourceCABundle":null,"volumeFileName":{"ca":"ca.crt","cert":"tls.crt","key":"tls.key"},"volumeMounts":[],"volumes":[]}` | Options for CSI driver |
+| app.driver.csiDataDir | string | `"/tmp/cert-manager-csi-driver-spiffe"` | Configures the hostPath directory that the driver will write and mount volumes from. |
 | app.driver.livenessProbe.port | int | `9809` | The port that will expose the liveness of the csi-driver |
 | app.driver.livenessProbeImage.pullPolicy | string | `"IfNotPresent"` | Kubernetes imagePullPolicy on liveness probe. |
 | app.driver.livenessProbeImage.repository | string | `"registry.k8s.io/sig-storage/livenessprobe"` | Target image repository. |

deploy/charts/csi-driver-spiffe/templates/csidriver.yaml

@@ -1,8 +1,4 @@
-{{- if .Capabilities.APIVersions.Has "storage.k8s.io/v1/CSIDriver" }}
 apiVersion: storage.k8s.io/v1
-{{- else }}
-apiVersion: storage.k8s.io/v1beta1
-{{- end }}
 kind: CSIDriver
 metadata:
   name: "{{ .Values.app.name }}"

deploy/charts/csi-driver-spiffe/templates/daemonset.yaml

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ include "cert-manager-csi-driver-spiffe.name" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "cert-manager-csi-driver-spiffe.labels" . | indent 4 }}
 spec:

deploy/charts/csi-driver-spiffe/templates/deployment.yaml

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "cert-manager-csi-driver-spiffe.name" . }}-approver
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "cert-manager-csi-driver-spiffe.labels" . | indent 4 }}
 spec:
@@ -37,9 +38,14 @@ spec:
           - --issuer-group={{ .Values.app.issuer.group }}
           - --trust-domain={{ .Values.app.trustDomain }}
 
-          - --leader-election-namespace={{ .Release.Namespace }}
+          - --leader-election-namespace=$(POD_NAMESPACE)
           - "--metrics-bind-address=:{{.Values.app.approver.metrics.port}}"
           - "--readiness-probe-bind-address=:{{.Values.app.approver.readinessProbe.port}}"
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         resources:
 {{- toYaml .Values.app.approver.resources | nindent 12 }}
       {{- with .Values.priorityClassName }}

deploy/charts/csi-driver-spiffe/templates/metrics-service.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "cert-manager-csi-driver-spiffe.name" . }}-approver-metrics
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ include "cert-manager-csi-driver-spiffe.name" . }}-approver
 {{ include "cert-manager-csi-driver-spiffe.labels" . | indent 4 }}

deploy/charts/csi-driver-spiffe/templates/role.yaml

@@ -2,6 +2,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ include "cert-manager-csi-driver-spiffe.name" . }}-approver
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "cert-manager-csi-driver-spiffe.labels" . | indent 4 }}
 rules:

deploy/charts/csi-driver-spiffe/templates/rolebinding.yaml

@@ -2,6 +2,7 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ include "cert-manager-csi-driver-spiffe.name" . }}-approver
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "cert-manager-csi-driver-spiffe.labels" . | indent 4 }}
 roleRef:

deploy/charts/csi-driver-spiffe/templates/serviceaccount.yaml

@@ -5,6 +5,7 @@ imagePullSecrets:
     {{- toYaml . | nindent 8 }}
 {{- end }}
 metadata:
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "cert-manager-csi-driver-spiffe.labels" . | indent 4 }}
   name: {{ include "cert-manager-csi-driver-spiffe.name" . }}
@@ -16,6 +17,7 @@ imagePullSecrets:
     {{- toYaml . | nindent 8 }}
 {{- end }}
 metadata:
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "cert-manager-csi-driver-spiffe.labels" . | indent 4 }}
   name: {{ include "cert-manager-csi-driver-spiffe.name" . }}-approver

deploy/charts/csi-driver-spiffe/values.yaml

@@ -52,7 +52,7 @@ app:
     #  mountPath: /var/run/secrets/cert-manager-csi-driver-spiffe
 
     # -- Configures the hostPath directory that the driver will write and mount volumes from.
-    csiDataDir: /tmp/cert-manager-csi-driver
+    csiDataDir: /tmp/cert-manager-csi-driver-spiffe
 
     resources: {}
     # -- Kubernetes pod resource limits for cert-manager-csi-driver-spiffe