Merge pull request #2782 from OdedViner/add_watch_snapshot

Add watch verb to snapshot.storage.k8s.io group
red-hat-storage · Sep 3, 2024 · 0f1459b · 0f1459b
2 parents 18a41cd + 71c73fc
commit 0f1459b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 25 deletions.
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -309,15 +309,8 @@ rules:
   - delete
   - get
   - list
+  - update
   - watch
-- apiGroups:
-  - snapshot.storage.k8s.io
-  resources:
-  - volumesnapshots
-  verbs:
-  - create
-  - delete
-  - get
 - apiGroups:
   - storage.k8s.io
   resources:

diff --git a/controllers/storagecluster/reconcile.go b/controllers/storagecluster/reconcile.go
@@ -114,8 +114,8 @@ var validTopologyLabelKeys = []string{
 // +kubebuilder:rbac:groups=core,resources=namespaces,verbs=get
 // +kubebuilder:rbac:groups=apps,resources=deployments;daemonsets;replicasets;statefulsets,verbs=get;list;watch;create;update;delete
 // +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors;prometheusrules,verbs=get;list;watch;create;update;delete
-// +kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshots;volumesnapshotclasses,verbs=get;create;delete
 // +kubebuilder:rbac:groups=template.openshift.io,resources=templates,verbs=get;list;watch;create;update;delete
+// +kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotclasses,verbs=get;watch;create;update;delete
 // +kubebuilder:rbac:groups=config.openshift.io,resources=infrastructures;networks,verbs=get;list;watch
 // +kubebuilder:rbac:groups=config.openshift.io,resources=clusterversions;networks,verbs=get;list;watch
 // +kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=get;list;watch;create;update

diff --git a/deploy/csv-templates/ocs-operator.csv.yaml.in b/deploy/csv-templates/ocs-operator.csv.yaml.in
@@ -480,15 +480,8 @@ spec:
           - delete
           - get
           - list
+          - update
           - watch
-        - apiGroups:
-          - snapshot.storage.k8s.io
-          resources:
-          - volumesnapshots
-          verbs:
-          - create
-          - delete
-          - get
         - apiGroups:
           - storage.k8s.io
           resources:

diff --git a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml
@@ -489,15 +489,8 @@ spec:
           - delete
           - get
           - list
+          - update
           - watch
-        - apiGroups:
-          - snapshot.storage.k8s.io
-          resources:
-          - volumesnapshots
-          verbs:
-          - create
-          - delete
-          - get
         - apiGroups:
           - storage.k8s.io
           resources: