Attempting to Fix TDR in Bees following upgrade to GKE 1.25 (#249)

broadinstitute · Feb 12, 2024 · 73262fb · 73262fb
1 parent e86aa5e
commit 73262fb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/charts/datarepo-api/templates/pod-running-policy.yaml b/charts/datarepo-api/templates/pod-running-policy.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.rbac.create }}
+{{- if .Values.rbac.create | and .Values.rbac.pspEnabled -}}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:

diff --git a/charts/datarepo-api/templates/role.yaml b/charts/datarepo-api/templates/role.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.rbac.create -}}
+{{- if .Values.rbac.create | and .Values.rbac.pspEnabled -}}
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

diff --git a/charts/datarepo-api/templates/rolebinding.yaml b/charts/datarepo-api/templates/rolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.rbac.create -}}
+{{- if .Values.rbac.create | and .Values.rbac.pspEnabled -}}
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

diff --git a/charts/datarepo-api/values.yaml b/charts/datarepo-api/values.yaml
@@ -48,6 +48,7 @@ rbac:
   create: false
   # If true, prefix the psp with the release's namespace. (Used to prevent conflicts in BEEs)
   namespacePrefix: false
+  pspEnabled: true
 service:
   port: 8080
   type: ClusterIP