Merge pull request #1346 from banzaicloud/disable-psp

[K8s 1.25 Support] Disable PodSecurityPolicy in prometheus operator charts
banzaicloud · Jul 13, 2023 · 51352f6 · 51352f6
2 parents 5c29670 + 82d72ee
commit 51352f6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/prometheus-operator-standalone/Chart.yaml b/prometheus-operator-standalone/Chart.yaml
@@ -8,7 +8,7 @@ keywords:
 - operator
 - prometheus
 name: prometheus-operator-standalone
-version: 13.4.0
+version: 13.4.1
 kubeVersion: ">=1.16.0-0"
 sources:
   - https://github.com/banzaicloud/banzai-charts

diff --git a/prometheus-operator-standalone/templates/psp-clusterrole.yaml b/prometheus-operator-standalone/templates/psp-clusterrole.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.pspEnabled }}
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -10,4 +11,4 @@ rules:
   verbs:     ['use']
   resourceNames:
   - {{ template "prometheus-operator.fullname" . }}
-
+{{- end }}
diff --git a/prometheus-operator-standalone/templates/psp-clusterrolebinding.yaml b/prometheus-operator-standalone/templates/psp-clusterrolebinding.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.pspEnabled }}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -12,3 +13,4 @@ subjects:
   - kind: ServiceAccount
     name: {{ template "prometheus-operator.fullname" . }}
     namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/prometheus-operator-standalone/templates/psp.yaml b/prometheus-operator-standalone/templates/psp.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.pspEnabled }}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
@@ -46,3 +47,4 @@ spec:
       - min: 0
         max: 65535
   readOnlyRootFilesystem: false
+{{- end }}
diff --git a/prometheus-operator-standalone/values.yaml b/prometheus-operator-standalone/values.yaml
@@ -19,7 +19,7 @@ kubeTargetVersionOverride: ""
 fullnameOverride: ""
 
 
-
+pspEnabled: false
 pspAnnotations: {}
 ## Specify pod annotations
 ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#apparmor