Update: change apigroup for codeflare and dsp (opendatahub-io#552)

- keep mcad.ibm.com because DSP still have it for a while Signed-off-by: Wen Zhou <wenzhou@redhat.com>
VaishnaviHire · Sep 22, 2023 · 2a81649 · 2a81649
1 parent 0b2bb98
commit 2a81649
Show file tree

Hide file tree

Showing 5 changed files with 123 additions and 2 deletions.
diff --git a/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml b/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml
@@ -33,7 +33,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: Defines the desired state of DataScienceCluster
+            description: DataScienceCluster defines the desired state of the cluster.
             properties:
               components:
                 description: Override and fine tune specific component configurations.

diff --git a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
@@ -559,14 +559,24 @@ spec:
           - instascales
           verbs:
           - create
+          - delete
+          - get
+          - list
           - patch
+          - update
+          - watch
         - apiGroups:
           - codeflare.codeflare.dev
           resources:
           - mcads
           verbs:
           - create
+          - delete
+          - get
+          - list
           - patch
+          - update
+          - watch
         - apiGroups:
           - config.openshift.io
           resources:
@@ -1508,6 +1518,58 @@ spec:
           - list
           - patch
           - watch
+        - apiGroups:
+          - workload.codeflare.dev
+          resources:
+          - appwrappers
+          verbs:
+          - create
+          - delete
+          - deletecollection
+          - get
+          - list
+          - patch
+          - update
+          - watch
+        - apiGroups:
+          - workload.codeflare.dev
+          resources:
+          - appwrappers/finalizers
+          verbs:
+          - create
+          - delete
+          - deletecollection
+          - get
+          - list
+          - patch
+          - update
+          - watch
+        - apiGroups:
+          - workload.codeflare.dev
+          resources:
+          - appwrappers/status
+          verbs:
+          - create
+          - delete
+          - deletecollection
+          - get
+          - list
+          - patch
+          - update
+          - watch
+        - apiGroups:
+          - workload.codeflare.dev
+          resources:
+          - queuejobs
+          verbs:
+          - create
+          - delete
+          - deletecollection
+          - get
+          - list
+          - patch
+          - update
+          - watch
         - apiGroups:
           - authentication.k8s.io
           resources:

diff --git a/config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml b/config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml
@@ -34,7 +34,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: Defines the desired state of DataScienceCluster
+            description: DataScienceCluster defines the desired state of the cluster.
             properties:
               components:
                 description: Override and fine tune specific component configurations.

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -1234,3 +1234,55 @@ rules:
   - list
   - patch
   - watch
+- apiGroups:
+  - workload.codeflare.dev
+  resources:
+  - appwrappers
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - workload.codeflare.dev
+  resources:
+  - appwrappers/finalizers
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - workload.codeflare.dev
+  resources:
+  - appwrappers/status
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - workload.codeflare.dev
+  resources:
+  - queuejobs
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
diff --git a/controllers/datasciencecluster/kubebuilder_rbac.go b/controllers/datasciencecluster/kubebuilder_rbac.go
@@ -88,8 +88,15 @@ package datasciencecluster
 // +kubebuilder:rbac:groups="monitoring.coreos.com",resources=prometheusrules,verbs=get;create;patch;delete
 // +kubebuilder:rbac:groups="monitoring.coreos.com",resources=prometheuses,verbs=get;create;patch;delete
 
+
+// TODO: cleanup when DSP do the switch
 // +kubebuilder:rbac:groups="mcad.ibm.com",resources=appwrappers,verbs=create;delete;list;patch;get
 
+// +kubebuilder:rbac:groups="workload.codeflare.dev",resources=appwrappers,verbs=create;delete;list;patch;get;deletecollection;update;watch
+// +kubebuilder:rbac:groups="workload.codeflare.dev",resources=appwrappers/finalizers,verbs=create;delete;list;patch;get;deletecollection;update;watch
+// +kubebuilder:rbac:groups="workload.codeflare.dev",resources=appwrappers/status,verbs=create;delete;list;patch;get;deletecollection;update;watch
+// +kubebuilder:rbac:groups="workload.codeflare.dev",resources=queuejobs,verbs=create;delete;list;patch;get;deletecollection;update;watch
+
 // +kubebuilder:rbac:groups="machinelearning.seldon.io",resources=seldondeployments,verbs=*
 
 // +kubebuilder:rbac:groups="machine.openshift.io",resources=machinesets,verbs=list;patch;delete