Skip to content
This repository was archived by the owner on Dec 3, 2024. It is now read-only.

Commit 7e6fd2c

Browse files
committed
fix rbac rules and check for errors getting bucketclass
1 parent 6654310 commit 7e6fd2c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

pkg/bucketrequest/bucketrequest.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (b *bucketRequestListener) InitializeBucketClient(bc bucketclientset.Interf
3737

3838
// Add creates a bucket in response to a bucketrequest
3939
func (b *bucketRequestListener) Add(ctx context.Context, obj *v1alpha1.BucketRequest) error {
40-
glog.V(1).Infof("Add called for BucketRequest %s", obj.Name)
40+
glog.V(3).Infof("Add called for BucketRequest %s", obj.Name)
4141
bucketRequest := obj
4242
err := b.provisionBucketRequestOperation(ctx, bucketRequest)
4343
if err != nil {
@@ -61,13 +61,13 @@ func (b *bucketRequestListener) Add(ctx context.Context, obj *v1alpha1.BucketReq
6161

6262
// update processes any updates made to the bucket request
6363
func (b *bucketRequestListener) Update(ctx context.Context, old, new *v1alpha1.BucketRequest) error {
64-
glog.V(1).Infof("Update called for BucketRequest %v", old.Name)
64+
glog.V(3).Infof("Update called for BucketRequest %v", old.Name)
6565
return nil
6666
}
6767

6868
// Delete processes a bucket for which bucket request is deleted
6969
func (b *bucketRequestListener) Delete(ctx context.Context, obj *v1alpha1.BucketRequest) error {
70-
glog.V(1).Infof("Delete called for BucketRequest %v", obj.Name)
70+
glog.V(3).Infof("Delete called for BucketRequest %v", obj.Name)
7171
return nil
7272
}
7373

@@ -81,8 +81,8 @@ func (b *bucketRequestListener) provisionBucketRequestOperation(ctx context.Cont
8181
bucketClassName := b.GetBucketClass(bucketRequest)
8282

8383
bucketClass, err := b.bucketClient.ObjectstorageV1alpha1().BucketClasses().Get(ctx, bucketClassName, metav1.GetOptions{})
84-
if bucketClass == nil {
85-
// bucketclass does not exist in order to create a bucket
84+
if err != nil {
85+
glog.Errorf("error getting bucketclass: [%v] %v", bucketClass, err)
8686
return util.ErrInvalidBucketClass
8787
}
8888

resources/rbac.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ metadata:
1212
rules:
1313
- apiGroups: ["objectstorage.k8s.io"]
1414
resources: ["bucketrequests", "bucketaccessrequests"]
15-
verbs: ["get", "list", "watch"]
15+
verbs: ["get", "list", "watch", "update"]
1616
- apiGroups: ["objectstorage.k8s.io"]
1717
resources: ["buckets", "bucketaccess"]
1818
verbs: ["get", "list", "watch", "update", "create", "delete"]
1919
- apiGroups: ["objectstorage.k8s.io"]
20-
resources: ["bucketclass","bucketaccessclass"]
20+
resources: ["bucketclasses","bucketaccessclasses"]
2121
verbs: ["get", "list"]
2222
- apiGroups: [""]
2323
resources: ["events"]

0 commit comments

Comments
 (0)