Merge pull request #813 from red-hat-storage/sync_us--master

Syncing latest changes from upstream master for rook
red-hat-storage · Feb 3, 2025 · c53d3fd · c53d3fd
2 parents 3112a2b + 98e188a
commit c53d3fd
Show file tree

Hide file tree

Showing 4 changed files with 300 additions and 10 deletions.
diff --git a/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml b/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml
@@ -3003,6 +3003,22 @@ spec:
                 - get
                 - list
                 - watch
+            - apiGroups:
+                - replication.storage.openshift.io
+              resources:
+                - volumegroupreplicationcontents
+              verbs:
+                - get
+                - list
+                - watch
+            - apiGroups:
+                - replication.storage.openshift.io
+              resources:
+                - volumegroupreplicationclasses
+              verbs:
+                - get
+                - list
+                - watch
           serviceAccountName: rook-csi-rbd-provisioner-sa
         - rules:
             - verbs:

diff --git a/deploy/charts/rook-ceph/templates/clusterrole.yaml b/deploy/charts/rook-ceph/templates/clusterrole.yaml
@@ -655,6 +655,12 @@ rules:
   - apiGroups: [""]
     resources: ["nodes"]
     verbs: ["get", "list", "watch"]
+  - apiGroups: ["replication.storage.openshift.io"]
+    resources: ["volumegroupreplicationcontents"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["replication.storage.openshift.io"]
+    resources: ["volumegroupreplicationclasses"]
+    verbs: ["get", "list", "watch"]
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/deploy/examples/common.yaml b/deploy/examples/common.yaml
@@ -216,6 +216,12 @@ rules:
   - apiGroups: [""]
     resources: ["nodes"]
     verbs: ["get", "list", "watch"]
+  - apiGroups: ["replication.storage.openshift.io"]
+    resources: ["volumegroupreplicationcontents"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["replication.storage.openshift.io"]
+    resources: ["volumegroupreplicationclasses"]
+    verbs: ["get", "list", "watch"]
 ---
 # The cluster role for managing all the cluster-specific resources in a namespace
 apiVersion: rbac.authorization.k8s.io/v1