Skip to content

Commit 7d3b7bf

Browse files
Merge pull request #543 from jakobmoellerdev/OCPBUGS-27226
OCPBUGS-27226: fix: add missing permissions to cluster scoped resources
2 parents 59b126d + ac3ea44 commit 7d3b7bf

File tree

7 files changed

+16
-7
lines changed

7 files changed

+16
-7
lines changed

bundle/manifests/lvms-operator.clusterserviceversion.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ spec:
320320
- delete
321321
- get
322322
- list
323+
- patch
323324
- update
324325
- watch
325326
- apiGroups:
@@ -331,6 +332,7 @@ spec:
331332
- delete
332333
- get
333334
- list
335+
- patch
334336
- update
335337
- watch
336338
- apiGroups:
@@ -366,6 +368,7 @@ spec:
366368
- delete
367369
- get
368370
- list
371+
- patch
369372
- update
370373
- watch
371374
- apiGroups:
@@ -397,6 +400,7 @@ spec:
397400
- delete
398401
- get
399402
- list
403+
- patch
400404
- update
401405
- watch
402406
- apiGroups:

config/rbac/role.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ rules:
212212
- delete
213213
- get
214214
- list
215+
- patch
215216
- update
216217
- watch
217218
- apiGroups:
@@ -223,6 +224,7 @@ rules:
223224
- delete
224225
- get
225226
- list
227+
- patch
226228
- update
227229
- watch
228230
- apiGroups:
@@ -258,6 +260,7 @@ rules:
258260
- delete
259261
- get
260262
- list
263+
- patch
261264
- update
262265
- watch
263266
- apiGroups:
@@ -289,6 +292,7 @@ rules:
289292
- delete
290293
- get
291294
- list
295+
- patch
292296
- update
293297
- watch
294298
- apiGroups:

internal/controllers/lvmcluster/controller.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ func (r *Reconciler) GetLogPassthroughOptions() *logpassthrough.Options {
117117
//+kubebuilder:rbac:groups=lvm.topolvm.io,resources=lvmvolumegroupnodestatuses,verbs=get;list;watch;create;update;patch;delete
118118
//+kubebuilder:rbac:groups=lvm.topolvm.io,resources=lvmvolumegroupnodestatuses/status,verbs=get;update;patch
119119
//+kubebuilder:rbac:groups=lvm.topolvm.io,resources=lvmvolumegroupnodestatuses/finalizers,verbs=update
120-
//+kubebuilder:rbac:groups=security.openshift.io,resources=securitycontextconstraints,verbs=get;list;watch;create;update;delete
121120
//+kubebuilder:rbac:groups=config.openshift.io,resources=infrastructures,verbs=get
122121
//+kubebuilder:rbac:groups=topolvm.io,resources=logicalvolumes,verbs=get;list;watch;create;update;patch;delete
123122
//+kubebuilder:rbac:groups=topolvm.io,resources=logicalvolumes/status,verbs=get;list;watch;create;update;patch;delete
@@ -128,12 +127,12 @@ func (r *Reconciler) GetLogPassthroughOptions() *logpassthrough.Options {
128127
//+kubebuilder:rbac:groups=core,resources=persistentvolumeclaims,verbs=get;list;watch;update;delete
129128
//+kubebuilder:rbac:groups=core,resources=persistentvolumeclaims/status,verbs=patch
130129
//+kubebuilder:rbac:groups=core,resources=events,verbs=list;watch;create;update;patch
131-
//+kubebuilder:rbac:groups=storage.k8s.io,resources=storageclasses,verbs=get;list;watch;update
132-
//+kubebuilder:rbac:groups=storage.k8s.io,resources=csidrivers,verbs=get;list;watch;update
130+
//+kubebuilder:rbac:groups=storage.k8s.io,resources=storageclasses,verbs=get;list;watch;update;patch;create;delete
131+
//+kubebuilder:rbac:groups=storage.k8s.io,resources=csidrivers,verbs=get;list;watch;update;patch;create;delete
133132
//+kubebuilder:rbac:groups=storage.k8s.io,resources=csinodes,verbs=get;list;watch
134133
//+kubebuilder:rbac:groups=storage.k8s.io,resources=volumeattachments,verbs=get;list;watch
135134
//+kubebuilder:rbac:groups=storage.k8s.io,resources=csistoragecapacities,verbs=get;list;watch;create;update;patch;delete
136-
//+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotclasses,verbs=get;list;watch;update
135+
//+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotclasses,verbs=get;list;watch;update;create;patch;delete
137136
//+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshots,verbs=get;list
138137
//+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotcontents,verbs=get;list;watch;update;patch
139138
//+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotcontents/status,verbs=update;patch

internal/controllers/lvmcluster/resource/scc.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ func (c openshiftSccs) GetName() string {
4949
return sccName
5050
}
5151

52+
//+kubebuilder:rbac:groups=security.openshift.io,resources=securitycontextconstraints,verbs=get;list;watch;create;update;delete;patch
53+
5254
func (c openshiftSccs) EnsureCreated(r Reconciler, ctx context.Context, cluster *lvmv1alpha1.LVMCluster) error {
5355
logger := log.FromContext(ctx).WithValues("resourceManager", c.GetName())
5456
sccs := getAllSCCs(r.GetNamespace())

internal/controllers/lvmcluster/resource/topolvm_csi_driver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (c csiDriver) GetName() string {
4848
return driverName
4949
}
5050

51-
//+kubebuilder:rbac:groups=storage.k8s.io,resources=csidrivers,verbs=get;create;delete;watch;list
51+
//+kubebuilder:rbac:groups=storage.k8s.io,resources=csidrivers,verbs=get;create;delete;watch;list;update;patch
5252

5353
func (c csiDriver) EnsureCreated(r Reconciler, ctx context.Context, cluster *lvmv1alpha1.LVMCluster) error {
5454
logger := log.FromContext(ctx).WithValues("resourceManager", c.GetName())

internal/controllers/lvmcluster/resource/topolvm_snapshotclass.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func (s topolvmVolumeSnapshotClass) GetName() string {
4949
return vscName
5050
}
5151

52-
//+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotclasses,verbs=get;create;delete;watch;list
52+
//+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotclasses,verbs=get;create;delete;watch;list;update;patch
5353

5454
func (s topolvmVolumeSnapshotClass) EnsureCreated(r Reconciler, ctx context.Context, cluster *lvmv1alpha1.LVMCluster) error {
5555
logger := log.FromContext(ctx).WithValues("resourceManager", s.GetName())

internal/controllers/lvmcluster/resource/topolvm_storageclass.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (s topolvmStorageClass) GetName() string {
4848
return scName
4949
}
5050

51-
//+kubebuilder:rbac:groups=storage.k8s.io,resources=storageclasses,verbs=get;create;delete;watch;list
51+
//+kubebuilder:rbac:groups=storage.k8s.io,resources=storageclasses,verbs=get;create;delete;watch;list;update;patch
5252

5353
func (s topolvmStorageClass) EnsureCreated(r Reconciler, ctx context.Context, cluster *lvmv1alpha1.LVMCluster) error {
5454
logger := log.FromContext(ctx).WithValues("resourceManager", s.GetName())

0 commit comments

Comments
 (0)