Switch to global PSP value (#292)

giantswarm · Jan 16, 2024 · fc835ee · fc835ee
1 parent a70522c
commit fc835ee
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Switch PSP values from `psp.enabled` to `global.podSecurityStandards.enforced`.
+
 ## [0.7.7] - 2023-12-19
 
 ### Added

diff --git a/helm/starboard-exporter/templates/psp.yaml b/helm/starboard-exporter/templates/psp.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.psp.enabled }}
+{{- if not .Values.global.podSecurityStandards.enforced }}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:

diff --git a/helm/starboard-exporter/templates/rbac.yaml b/helm/starboard-exporter/templates/rbac.yaml
@@ -70,7 +70,7 @@ roleRef:
   name: {{ include "resource.default.name"  . }}
   apiGroup: rbac.authorization.k8s.io
 ---
-{{ if .Values.psp.enabled }}
+{{ if not .Values.global.podSecurityStandards.enforced }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

diff --git a/helm/starboard-exporter/values.schema.json b/helm/starboard-exporter/values.schema.json
@@ -49,6 +49,19 @@
                 }
             }
         },
+        "global": {
+            "type": "object",
+            "properties": {
+                "podSecurityStandards": {
+                    "type": "object",
+                    "properties": {
+                        "enforced": {
+                            "type": "boolean"
+                        }
+                    }
+                }
+            }
+        },
         "image": {
             "type": "object",
             "properties": {
@@ -178,14 +191,6 @@
                 }
             }
         },
-        "psp": {
-            "type": "object",
-            "properties": {
-                "enabled": {
-                    "type": "boolean"
-                }
-            }
-        },
         "registry": {
             "type": "object",
             "properties": {

diff --git a/helm/starboard-exporter/values.yaml b/helm/starboard-exporter/values.yaml
@@ -7,6 +7,10 @@ image:
 
 imagePullSecrets: {}
 
+global:
+  podSecurityStandards:
+    enforced: false
+
 pod:
   user:
     id: 1000
@@ -72,9 +76,6 @@ monitoring:
     enabled: true
     # namespace: ""
 
-psp:
-  enabled: true
-
 networkpolicy:
   enabled: true