From 2bde39f8fc5b90948468cf7b0c5d9e322a6e6c70 Mon Sep 17 00:00:00 2001
From: Juan Ariza Toledano <jariza@vmware.com>
Date: Mon, 2 Oct 2023 08:11:29 +0200
Subject: [PATCH] [bitnami/influxdb] Use common capabilities for PSP (#19628)

---
 bitnami/influxdb/Chart.lock                                 | 6 +++---
 bitnami/influxdb/Chart.yaml                                 | 2 +-
 bitnami/influxdb/templates/{role.yaml => psp-role.yaml}     | 5 +----
 .../templates/{rolebinding.yaml => psp-rolebinding.yaml}    | 2 +-
 .../influxdb/templates/{podsecuritypolicy.yaml => psp.yaml} | 3 +--
 5 files changed, 7 insertions(+), 11 deletions(-)
 rename bitnami/influxdb/templates/{role.yaml => psp-role.yaml} (79%)
 rename bitnami/influxdb/templates/{rolebinding.yaml => psp-rolebinding.yaml} (88%)
 rename bitnami/influxdb/templates/{podsecuritypolicy.yaml => psp.yaml} (87%)

diff --git a/bitnami/influxdb/Chart.lock b/bitnami/influxdb/Chart.lock
index 95779e9626..58bc6e26a9 100644
--- a/bitnami/influxdb/Chart.lock
+++ b/bitnami/influxdb/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.10.0
-digest: sha256:023ded170632d04528f30332370f34fc8fb96efb2886a01d934cb3bd6e6d2e09
-generated: "2023-09-06T21:50:29.857137178Z"
+  version: 2.13.0
+digest: sha256:6b6084c51b6a028a651f6e8539d0197487ee807c5bae44867d4ea6ccd1f9ae93
+generated: "2023-09-29T10:57:21.706211+02:00"
diff --git a/bitnami/influxdb/Chart.yaml b/bitnami/influxdb/Chart.yaml
index eea4b729ad..c74b0d44c0 100644
--- a/bitnami/influxdb/Chart.yaml
+++ b/bitnami/influxdb/Chart.yaml
@@ -37,4 +37,4 @@ maintainers:
 name: influxdb
 sources:
   - https://github.com/bitnami/charts/tree/main/bitnami/influxdb
-version: 5.9.3
+version: 5.9.4
diff --git a/bitnami/influxdb/templates/role.yaml b/bitnami/influxdb/templates/psp-role.yaml
similarity index 79%
rename from bitnami/influxdb/templates/role.yaml
rename to bitnami/influxdb/templates/psp-role.yaml
index 7272ebc7f7..d4e6826506 100644
--- a/bitnami/influxdb/templates/role.yaml
+++ b/bitnami/influxdb/templates/psp-role.yaml
@@ -3,7 +3,7 @@ Copyright VMware, Inc.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.rbac.create }}
+{{- if and (include "common.capabilities.psp.supported" .) .Values.rbac.create .Values.psp.create }}
 kind: Role
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 metadata:
@@ -14,12 +14,9 @@ metadata:
   {{- end }}
   namespace: {{ .Release.Namespace | quote }}
 rules:
-  {{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) -}}
-  {{- if and $pspAvailable .Values.psp.create }}
   - apiGroups: ["extensions"]
     resources: ["podsecuritypolicies"]
     verbs: ["use"]
     resourceNames:
       - {{ template "common.names.fullname" . }}
-  {{- end }}
 {{- end }}
diff --git a/bitnami/influxdb/templates/rolebinding.yaml b/bitnami/influxdb/templates/psp-rolebinding.yaml
similarity index 88%
rename from bitnami/influxdb/templates/rolebinding.yaml
rename to bitnami/influxdb/templates/psp-rolebinding.yaml
index 10ce155bdd..bb906dedef 100644
--- a/bitnami/influxdb/templates/rolebinding.yaml
+++ b/bitnami/influxdb/templates/psp-rolebinding.yaml
@@ -3,7 +3,7 @@ Copyright VMware, Inc.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if .Values.rbac.create }}
+{{- if and (include "common.capabilities.psp.supported" .) .Values.rbac.create .Values.psp.create }}
 kind: RoleBinding
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 metadata:
diff --git a/bitnami/influxdb/templates/podsecuritypolicy.yaml b/bitnami/influxdb/templates/psp.yaml
similarity index 87%
rename from bitnami/influxdb/templates/podsecuritypolicy.yaml
rename to bitnami/influxdb/templates/psp.yaml
index 3b8c9e3cb1..a3b3af2f08 100644
--- a/bitnami/influxdb/templates/podsecuritypolicy.yaml
+++ b/bitnami/influxdb/templates/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 $pspAvailable .Values.psp.create }}
+{{- if and (include "common.capabilities.psp.supported" .) .Values.psp.create }}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata: