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

Commit

Permalink
fix rbac rules and check for errors getting bucketclass
Browse files Browse the repository at this point in the history
  • Loading branch information
wlan0 committed Jan 13, 2021
1 parent 6654310 commit 7e6fd2c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions pkg/bucketrequest/bucketrequest.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (b *bucketRequestListener) InitializeBucketClient(bc bucketclientset.Interf

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

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

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions resources/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ metadata:
rules:
- apiGroups: ["objectstorage.k8s.io"]
resources: ["bucketrequests", "bucketaccessrequests"]
verbs: ["get", "list", "watch"]
verbs: ["get", "list", "watch", "update"]
- apiGroups: ["objectstorage.k8s.io"]
resources: ["buckets", "bucketaccess"]
verbs: ["get", "list", "watch", "update", "create", "delete"]
- apiGroups: ["objectstorage.k8s.io"]
resources: ["bucketclass","bucketaccessclass"]
resources: ["bucketclasses","bucketaccessclasses"]
verbs: ["get", "list"]
- apiGroups: [""]
resources: ["events"]
Expand Down

0 comments on commit 7e6fd2c

Please # to comment.