revert criteo specifics about rbac deployment

current approach is too invasive and not fully compatible with one operator per namespace deployment.
criteo-forks · Mar 1, 2024 · 0748e4f · 0748e4f
1 parent 269a5e2
commit 0748e4f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 8 deletions.
diff --git a/deploy/charts/rook-ceph/templates/cluster-rbac.yaml b/deploy/charts/rook-ceph/templates/cluster-rbac.yaml
@@ -13,9 +13,7 @@ serviceaccounts
 clusterrolebindings
 */}}
 ---
-{{- if .Values.rbacClusterEnable }}
 {{ include "library.cluster.clusterrolebindings" . }}
-{{- end }}
 
 {{- if .Values.pspEnable }}
 {{ include "library.cluster.psp.rolebindings" . }}

diff --git a/deploy/charts/rook-ceph/templates/clusterrole.yaml b/deploy/charts/rook-ceph/templates/clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.rbacEnable .Values.rbacClusterEnable }}
+{{- if .Values.rbacEnable }}
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

diff --git a/deploy/charts/rook-ceph/templates/clusterrolebinding.yaml b/deploy/charts/rook-ceph/templates/clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.rbacEnable .Values.rbacClusterEnable }}
+{{- if .Values.rbacEnable }}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

diff --git a/deploy/charts/rook-ceph/templates/psp.yaml b/deploy/charts/rook-ceph/templates/psp.yaml
@@ -80,7 +80,7 @@ spec:
     # port for CSIAddons
     - min: 9070
       max: 9070
-{{- if and .Values.rbacEnable .Values.rbacClusterEnable }}
+{{- if .Values.rbacEnable }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml
@@ -55,9 +55,6 @@ logLevel: INFO
 # -- If true, create & use RBAC resources
 rbacEnable: true
 
-# -- If true, create cluster-wide RBAC resources
-rbacClusterEnable: true
-
 # -- If true, create & use PSP resources
 pspEnable: false