From 0a714c2fe347e0adadb930db161d7cec07420ee0 Mon Sep 17 00:00:00 2001
From: Juan Ariza Toledano <jariza@vmware.com>
Date: Tue, 3 Oct 2023 08:42:43 +0200
Subject: [PATCH] [bitnami/concourse] Use common capabilities for PSP (#19625)

---
 bitnami/concourse/Chart.yaml                              | 2 +-
 bitnami/concourse/templates/web/podsecuritypolicy.yaml    | 3 +--
 bitnami/concourse/templates/web/role.yaml                 | 3 +--
 bitnami/concourse/templates/worker/podsecuritypolicy.yaml | 3 +--
 bitnami/concourse/templates/worker/role.yaml              | 3 +--
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/bitnami/concourse/Chart.yaml b/bitnami/concourse/Chart.yaml
index cf07b12dd5..6a360e1a08 100644
--- a/bitnami/concourse/Chart.yaml
+++ b/bitnami/concourse/Chart.yaml
@@ -37,4 +37,4 @@ maintainers:
 name: concourse
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/concourse
-version: 3.0.1
+version: 3.0.2
diff --git a/bitnami/concourse/templates/web/podsecuritypolicy.yaml b/bitnami/concourse/templates/web/podsecuritypolicy.yaml
index b3a86a841c..49d760e0fd 100644
--- a/bitnami/concourse/templates/web/podsecuritypolicy.yaml
+++ b/bitnami/concourse/templates/web/podsecuritypolicy.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.web.enabled .Values.web.psp.create -}}
+{{- if and (include "common.capabilities.psp.supported" .) .Values.web.enabled .Values.web.psp.create -}}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
diff --git a/bitnami/concourse/templates/web/role.yaml b/bitnami/concourse/templates/web/role.yaml
index 3547838309..226b1359ca 100644
--- a/bitnami/concourse/templates/web/role.yaml
+++ b/bitnami/concourse/templates/web/role.yaml
@@ -22,8 +22,7 @@ rules:
   {{- include "common.tplvalues.render" ( dict "value" .Values.web.rbac.rules "context" $ ) | nindent 2 }}
   {{- end }}
 {{- end }}
-{{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) }}
-{{- if and $pspAvailable .Values.web.psp.create }}
+{{- if and (include "common.capabilities.psp.supported" .) .Values.web.psp.create }}
 ---
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRole
diff --git a/bitnami/concourse/templates/worker/podsecuritypolicy.yaml b/bitnami/concourse/templates/worker/podsecuritypolicy.yaml
index ddb0e3fa2b..d93f9ea521 100644
--- a/bitnami/concourse/templates/worker/podsecuritypolicy.yaml
+++ b/bitnami/concourse/templates/worker/podsecuritypolicy.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.worker.enabled .Values.worker.psp.create -}}
+{{- if and (include "common.capabilities.psp.supported" .) .Values.worker.enabled .Values.worker.psp.create -}}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
diff --git a/bitnami/concourse/templates/worker/role.yaml b/bitnami/concourse/templates/worker/role.yaml
index 53194a3d46..f736cbf444 100644
--- a/bitnami/concourse/templates/worker/role.yaml
+++ b/bitnami/concourse/templates/worker/role.yaml
@@ -22,8 +22,7 @@ rules:
   {{- include "common.tplvalues.render" ( dict "value" .Values.worker.rbac.rules "context" $ ) | nindent 2 }}
   {{- end }}
 {{- end }}
-{{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) }}
-{{- if and $pspAvailable .Values.worker.psp.create }}
+{{- if and (include "common.capabilities.psp.supported" .) .Values.worker.psp.create }}
 ---
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRole