[bitnami/metallb] Use common capabilities for PSP (#19632)

bitnami/metallb/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.11.1
+  version: 2.13.0
-digest: sha256:ead8f26c76a9ec082f23629a358e8efd8f88d87aaed734bf41febcb8a7bc5d4c
+digest: sha256:6b6084c51b6a028a651f6e8539d0197487ee807c5bae44867d4ea6ccd1f9ae93
-generated: "2023-09-18T14:42:34.646382+02:00"
+generated: "2023-09-29T11:02:24.606057+02:00"

bitnami/metallb/Chart.yaml

@@ -35,4 +35,4 @@ maintainers:
 name: metallb
 sources:
   - https://github.com/bitnami/charts/tree/main/bitnami/metallb
-version: 4.7.3
+version: 4.7.4

bitnami/metallb/templates/controller/psp.yaml

@@ -3,8 +3,7 @@ Copyright VMware, Inc.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) -}}
+{{- if and (include "common.capabilities.psp.supported" .) .Values.psp.create .Values.controller.psp.create -}}
-{{- if and $pspAvailable .Values.psp.create .Values.controller.psp.create -}}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:

bitnami/metallb/templates/controller/rbac.yaml

@@ -51,6 +51,7 @@ rules:
       - list
       - watch
       - get
+  {{- if and (include "common.capabilities.psp.supported" .) .Values.psp.create .Values.controller.psp.create -}}
   - apiGroups:
       - policy
     resourceNames:
@@ -59,6 +60,7 @@ rules:
       - podsecuritypolicies
     verbs:
       - use
+  {{- end }}
   - apiGroups:
       - admissionregistration.k8s.io
     resources:

bitnami/metallb/templates/speaker/psp.yaml

@@ -4,8 +4,7 @@ SPDX-License-Identifier: APACHE-2.0
 */}}
 
 {{- if .Values.speaker.enabled }}
-{{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) -}}
+{{- if and (include "common.capabilities.psp.supported" .) .Values.psp.create .Values.speaker.psp.create -}}
-{{- if and $pspAvailable .Values.psp.create .Values.speaker.psp.create -}}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:

bitnami/metallb/templates/speaker/rbac.yaml

@@ -34,6 +34,7 @@ rules:
     verbs:
       - create
       - patch
+  {{- if and (include "common.capabilities.psp.supported" .) .Values.psp.create .Values.speaker.psp.create -}}
   - apiGroups:
       - policy
     resourceNames:
@@ -42,6 +43,7 @@ rules:
       - podsecuritypolicies
     verbs:
       - use
+  {{- end }}
   - apiGroups:
       - discovery.k8s.io
     resources: