rbac fix

NearNodeFlash · Nov 9, 2023 · da3a760 · da3a760
1 parent 417e74f
commit da3a760
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 63 deletions.
diff --git a/config/rbac/datamovementmanager_editor_role.yaml b/config/rbac/datamovementmanager_editor_role.yaml
diff --git a/config/rbac/datamovementmanager_viewer_role.yaml b/config/rbac/datamovementmanager_viewer_role.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -255,22 +255,6 @@ rules:
   - workflows/finalizers
   verbs:
   - update
-- apiGroups:
-  - dm.cray.hpe.com
-  resources:
-  - datamovementmanagers
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - dm.cray.hpe.com
-  resources:
-  - datamovementmanagers/status
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - kubeflow.org
   resources:
@@ -340,6 +324,22 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - nnf.cray.hpe.com
+  resources:
+  - nnfdatamovementmanagers
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - nnf.cray.hpe.com
+  resources:
+  - nnfdatamovementmanagers/status
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - nnf.cray.hpe.com
   resources:

diff --git a/internal/controller/nnf_workflow_controller.go b/internal/controller/nnf_workflow_controller.go
@@ -74,6 +74,8 @@ type NnfWorkflowReconciler struct {
 //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfstorages,verbs=get;create;list;watch;update;patch;delete;deletecollection
 //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfaccesses,verbs=get;create;list;watch;update;patch;delete;deletecollection
 //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfdatamovements,verbs=get;create;list;watch;update;patch;delete;deletecollection
+//+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfdatamovementmanagers,verbs=get;list;watch
+//+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfdatamovementmanagers/status,verbs=get;list;watch;
 //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfstorageprofiles,verbs=get;create;list;watch;update;patch;delete;deletecollection
 //+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=persistentstorageinstances,verbs=get;create;list;watch;update;patch;delete;deletecollection
 //+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=servers,verbs=get;create;list;watch;update;patch
@@ -85,9 +87,6 @@ type NnfWorkflowReconciler struct {
 //+kubebuilder:rbac:groups=core,resources=services,verbs=get;list;create;update;patch;delete;deletecollection
 //+kubebuilder:rbac:groups=kubeflow.org,resources=mpijobs,verbs=get;list;create;watch;update;patch;delete;deletecollection
 
-//+kubebuilder:rbac:groups=dm.cray.hpe.com,resources=datamovementmanagers,verbs=get;list;watch
-//+kubebuilder:rbac:groups=dm.cray.hpe.com,resources=datamovementmanagers/status,verbs=get;list;watch;
-
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
 //