Prepare 1.25 support (#73)

* substitute upstream psp condition with our own * fix path
giantswarm · Feb 27, 2024 · caba1b9 · caba1b9
1 parent 2497c55
commit caba1b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/hack/custom-patches.sh b/hack/custom-patches.sh
@@ -18,3 +18,9 @@ ${YQ} e '.spec.template.spec.securityContext.remove-this-key="'"
 "'"' ${f} > ${f}.tmp
 cat ${f}.tmp | grep -v 'remove-this-key' > ${f}
 rm -rf ${f}.tmp
+
+# Replace the upstream psp condition with our own.
+
+cpi_psp_file="helm/cloud-provider-vsphere/charts/cloud-provider-for-vsphere/templates/podsecuritypolicy.yaml"
+
+sed -i 's/{{- if \.Values\.podSecurityPolicy\.enabled }}/{{- if not .Values.global.podSecurityStandards.enforced }}/g' "$cpi_psp_file"
diff --git a/...cloud-provider-vsphere/charts/cloud-provider-for-vsphere/templates/podsecuritypolicy.yaml b/...cloud-provider-vsphere/charts/cloud-provider-for-vsphere/templates/podsecuritypolicy.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.podSecurityPolicy.enabled }}
+{{- if not .Values.global.podSecurityStandards.enforced }}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata: