From dd8840d5a45a6a0224626bc15ed9f3046c93ecfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n=20Garc=C3=ADa?=
 <javier.salmeron@broadcom.com>
Date: Tue, 6 May 2025 13:10:36 +0200
Subject: [PATCH] [bitnami/nginx-ingress-controller] chore: :recycle: Remove
 extra unnecessary k8s version checks (#33453)

---
 bitnami/nginx-ingress-controller/CHANGELOG.md |  8 ++++++--
 bitnami/nginx-ingress-controller/Chart.yaml   |  2 +-
 .../templates/_helpers.tpl                    | 20 -------------------
 .../templates/clusterrole.yaml                |  3 ---
 .../templates/role.yaml                       |  4 +---
 5 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/bitnami/nginx-ingress-controller/CHANGELOG.md b/bitnami/nginx-ingress-controller/CHANGELOG.md
index 35d799837d..01e66c564e 100644
--- a/bitnami/nginx-ingress-controller/CHANGELOG.md
+++ b/bitnami/nginx-ingress-controller/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 11.6.18 (2025-05-06)
+## 11.6.19 (2025-05-06)
 
-* [bitnami/nginx-ingress-controller] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references ([#33414](https://github.com/bitnami/charts/pull/33414))
+* [bitnami/nginx-ingress-controller] chore: :recycle: Remove extra unnecessary k8s version checks ([#33453](https://github.com/bitnami/charts/pull/33453))
+
+## <small>11.6.18 (2025-05-06)</small>
+
+* [bitnami/nginx-ingress-controller] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 r ([61a1119](https://github.com/bitnami/charts/commit/61a111923dc51ae9ae31b5abd35594b551314111)), closes [#33414](https://github.com/bitnami/charts/issues/33414)
 
 ## <small>11.6.17 (2025-05-05)</small>
 
diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml
index 55cdf78d5a..d3b1aa5bcf 100644
--- a/bitnami/nginx-ingress-controller/Chart.yaml
+++ b/bitnami/nginx-ingress-controller/Chart.yaml
@@ -35,4 +35,4 @@ maintainers:
 name: nginx-ingress-controller
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/nginx-ingress-controller
-version: 11.6.18
+version: 11.6.19
diff --git a/bitnami/nginx-ingress-controller/templates/_helpers.tpl b/bitnami/nginx-ingress-controller/templates/_helpers.tpl
index 51a4f011fc..f5b346eb83 100644
--- a/bitnami/nginx-ingress-controller/templates/_helpers.tpl
+++ b/bitnami/nginx-ingress-controller/templates/_helpers.tpl
@@ -67,23 +67,3 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
-
-{{/*
-Return the appropriate apiGroup for PodSecurityPolicy.
-*/}}
-{{- define "nginx-ingress-controller.podSecurityPolicy.apiGroup" -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "policy" -}}
-{{- else -}}
-{{- print "extensions" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Require extensions API group based on Kubernetes version
-*/}}
-{{- define "nginx-ingress-controller.role.extensions.apiGroup" -}}
-{{- if semverCompare "<1.16-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "- extensions" -}}
-{{- end -}}
-{{- end -}}
diff --git a/bitnami/nginx-ingress-controller/templates/clusterrole.yaml b/bitnami/nginx-ingress-controller/templates/clusterrole.yaml
index 70c0b7a38e..5d86e2bcc3 100644
--- a/bitnami/nginx-ingress-controller/templates/clusterrole.yaml
+++ b/bitnami/nginx-ingress-controller/templates/clusterrole.yaml
@@ -60,7 +60,6 @@ rules:
       - update
       - watch
   - apiGroups:
-      {{- include "nginx-ingress-controller.role.extensions.apiGroup" . | nindent 6 }}
       - networking.k8s.io
     resources:
       - ingresses
@@ -76,14 +75,12 @@ rules:
       - create
       - patch
   - apiGroups:
-      {{- include "nginx-ingress-controller.role.extensions.apiGroup" . | nindent 6 }}
       - networking.k8s.io
     resources:
       - ingresses/status
     verbs:
       - update
   - apiGroups:
-      {{- include "nginx-ingress-controller.role.extensions.apiGroup" . | nindent 6 }}
       - networking.k8s.io
     resources:
       - ingressclasses
diff --git a/bitnami/nginx-ingress-controller/templates/role.yaml b/bitnami/nginx-ingress-controller/templates/role.yaml
index 7e54817b0b..1854d56cf2 100644
--- a/bitnami/nginx-ingress-controller/templates/role.yaml
+++ b/bitnami/nginx-ingress-controller/templates/role.yaml
@@ -41,7 +41,6 @@ rules:
       - update
       - watch
   - apiGroups:
-      {{- include "nginx-ingress-controller.role.extensions.apiGroup" . | nindent 6 }}
       - networking.k8s.io
     resources:
       - ingresses
@@ -50,7 +49,6 @@ rules:
       - list
       - watch
   - apiGroups:
-      {{- include "nginx-ingress-controller.role.extensions.apiGroup" . | nindent 6 }}
       - networking.k8s.io
     resources:
       - ingresses/status
@@ -91,7 +89,7 @@ rules:
   {{- end }}
   {{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) -}}
   {{- if and $pspAvailable .Values.podSecurityPolicy.enabled }}
-  - apiGroups: [{{ template "nginx-ingress-controller.podSecurityPolicy.apiGroup" . }}]
+  - apiGroups: ['policy']
     resources: ['podsecuritypolicies']
     verbs: ['use']
     resourceNames: [{{ template "common.names.fullname" . }}]