add patch rbac for mcl to ocm-controller (stolostron#435)

* add patch rbac for mcl to ocm-controller Signed-off-by: Zhiwei Yin <[email protected]> * Regenerate bundle Signed-off-by: Jakob Gray <[email protected]> --------- Signed-off-by: Zhiwei Yin <[email protected]> Signed-off-by: Jakob Gray <[email protected]> Co-authored-by: Jakob Gray <[email protected]>
eemurphy · May 18, 2023 · 0f621ea · 0f621ea
1 parent 661c64c
commit 0f621ea
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 30 deletions.
diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=multicluster-engine
 LABEL operators.operatorframework.io.bundle.channels.v1=stable
 LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.27.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

diff --git a/bundle/manifests/multicluster-engine.clusterserviceversion.yaml b/bundle/manifests/multicluster-engine.clusterserviceversion.yaml
@@ -14,8 +14,8 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2023-03-17T18:46:48Z"
-    operators.operatorframework.io/builder: operator-sdk-v1.27.0
+    createdAt: "2023-05-18T13:32:47Z"
+    operators.operatorframework.io/builder: operator-sdk-v1.28.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: multicluster-engine.v0.0.1
   namespace: placeholder
@@ -1293,18 +1293,6 @@ spec:
           - get
           - list
           - watch
-        - apiGroups:
-          - cluster.open-cluster-management.io
-          resources:
-          - managedclusters
-          - managedclustersets
-          - placementdecisions
-          - placementdecisions/status
-          verbs:
-          - get
-          - list
-          - update
-          - watch
         - apiGroups:
           - cluster.open-cluster-management.io
           resources:
@@ -1325,6 +1313,17 @@ spec:
           - patch
           - update
           - watch
+        - apiGroups:
+          - cluster.open-cluster-management.io
+          resources:
+          - managedclustersets
+          - placementdecisions
+          - placementdecisions/status
+          verbs:
+          - get
+          - list
+          - update
+          - watch
         - apiGroups:
           - cluster.open-cluster-management.io
           resources:

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -6,7 +6,7 @@ annotations:
   operators.operatorframework.io.bundle.package.v1: multicluster-engine
   operators.operatorframework.io.bundle.channels.v1: stable
   operators.operatorframework.io.bundle.channel.default.v1: stable
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.27.0
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
 

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -1224,18 +1224,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - cluster.open-cluster-management.io
-  resources:
-  - managedclusters
-  - managedclustersets
-  - placementdecisions
-  - placementdecisions/status
-  verbs:
-  - get
-  - list
-  - update
-  - watch
 - apiGroups:
   - cluster.open-cluster-management.io
   resources:
@@ -1256,6 +1244,17 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - cluster.open-cluster-management.io
+  resources:
+  - managedclustersets
+  - placementdecisions
+  - placementdecisions/status
+  verbs:
+  - get
+  - list
+  - update
+  - watch
 - apiGroups:
   - cluster.open-cluster-management.io
   resources:

diff --git a/pkg/templates/charts/toggle/server-foundation/templates/clusterrole-foundation.yaml b/pkg/templates/charts/toggle/server-foundation/templates/clusterrole-foundation.yaml
@@ -27,8 +27,11 @@ rules:
     resources: ["deployables", "deployables/status"]
     verbs: ["get", "list", "watch", "update", "patch"]
   - apiGroups: ["cluster.open-cluster-management.io"]
-    resources: ["managedclusters", "managedclustersets", "placementdecisions", "placementdecisions/status"]
+    resources: ["managedclustersets", "placementdecisions", "placementdecisions/status"]
     verbs: ["get", "list", "watch", "update"]
+  - apiGroups: [ "cluster.open-cluster-management.io" ]
+    resources: [ "managedclusters"]
+    verbs: [ "get", "list", "watch", "update", "patch" ]
   - apiGroups: ["cluster.open-cluster-management.io"]
     resources: ["managedclustersetbindings"]
     verbs: ["create", "update", "get", "list", "watch", "delete", "deletecollection", "patch"]

diff --git a/pkg/templates/rbac_gen.go b/pkg/templates/rbac_gen.go