Auto add default CSIDriver labels on OpenShift

Signed-off-by: Kevin Fox <[email protected]>
spiffe · Nov 20, 2023 · 966061c · 966061c
1 parent c9885de
commit 966061c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/charts/spire/charts/spiffe-csi-driver/templates/spiffe-csi-driver.yaml b/charts/spire/charts/spiffe-csi-driver/templates/spiffe-csi-driver.yaml
@@ -1,8 +1,13 @@
+{{- $labels := dict }}
+{{- if (dig "openshift" false .Values.global) }}
+{{- $_ := set $labels "security.openshift.io/csi-ephemeral-volume-profile" "restricted" }}
+{{- end }}
+{{- $labels = mergeOverwrite $labels .Values.csiDriverLabels }}
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
   name: {{ .Values.pluginName | quote }}
-  {{- with .Values.csiDriverLabels }}
+  {{- with $labels }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}

diff --git a/examples/openshift/openshift-values.yaml b/examples/openshift/openshift-values.yaml
@@ -58,8 +58,6 @@ tornjak-frontend:
     fsGroup: null
 
 spiffe-csi-driver:
-  csiDriverLabels:
-    security.openshift.io/csi-ephemeral-volume-profile: restricted
   initContainers:
     - terminationMessagePath: /dev/termination-log
       name: set-context