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 index 95d0086..cd17fdd 100644 --- 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 index 013a636..2763601 100644 --- 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