Avoid conflict when deploying one operator per namespace (#16)

criteo-forks · May 13, 2024 · a38ea67 · a38ea67
1 parent 6645cd5
commit a38ea67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/deploy/charts/rook-ceph/templates/clusterrole.yaml b/deploy/charts/rook-ceph/templates/clusterrole.yaml
@@ -613,7 +613,7 @@ rules:
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: objectstorage-provisioner-role
+  name: objectstorage-provisioner-role{{ if .Values.currentNamespaceOnly }}-{{ .Release.Namespace }}{{ end }}
   labels:
     app.kubernetes.io/part-of: container-object-storage-interface
     app.kubernetes.io/component: driver-ceph

diff --git a/deploy/charts/rook-ceph/templates/clusterrolebinding.yaml b/deploy/charts/rook-ceph/templates/clusterrolebinding.yaml
@@ -136,14 +136,14 @@ roleRef:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: objectstorage-provisioner-role-binding
+  name: objectstorage-provisioner-role-binding{{ if .Values.currentNamespaceOnly }}-{{ .Release.Namespace }}{{ end }}
   labels:
     app.kubernetes.io/part-of: container-object-storage-interface
     app.kubernetes.io/component: driver-ceph
     app.kubernetes.io/name: cosi-driver-ceph
 subjects:
   - kind: ServiceAccount
-    name: objectstorage-provisioner
+    name: objectstorage-provisioner{{ if .Values.currentNamespaceOnly }}-{{ .Release.Namespace }}{{ end }}
     namespace: {{ .Release.Namespace }} # namespace:operator
 roleRef:
   kind: ClusterRole