Disable PodSecurityPolicy for Kubernetes >= v1.25. (#352)

giantswarm · Oct 17, 2022 · 9fc7aec · 9fc7aec
1 parent 4c48d4b
commit 9fc7aec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
 
 - Add support to create internal Load Balancers on GCP.
 
+### Removed
+
+- Disable `PodSecurityPolicy` for Kubernetes >= v1.25. ([#352](https://github.com/giantswarm/nginx-ingress-controller-app/pull/352))
+
 ## [2.18.2] - 2022-10-17
 
 ### Changed

diff --git a/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/psp.yaml b/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/psp.yaml
@@ -1,3 +1,4 @@
+{{- if (semverCompare "<1.25.0-0" .Capabilities.KubeVersion.Version) }}
 {{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled .Values.podSecurityPolicy.enabled -}}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
@@ -35,3 +36,4 @@ spec:
   - secret
   - downwardAPI
 {{- end }}
+{{- end }}
diff --git a/helm/nginx-ingress-controller-app/templates/psp.yaml b/helm/nginx-ingress-controller-app/templates/psp.yaml
@@ -1,3 +1,4 @@
+{{- if (semverCompare "<1.25.0-0" .Capabilities.KubeVersion.Version) }}
 {{- if .Values.podSecurityPolicy.enabled -}}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
@@ -37,3 +38,4 @@ spec:
   - 'secret'
   - 'configMap'
 {{- end }}
+{{- end }}