Fixing some logs and adding bucket paramaters

Author: mukhoakash

pkg/bucket/bucket_controller.go

@@ -17,6 +17,7 @@ package bucket
 
 import (
 "context"
+"fmt"
 "strings"
 
 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -66,9 +67,13 @@ func (b *BucketListener) Add(ctx context.Context, inputBucket *v1alpha1.Bucket)
 var err error
 
 klog.V(3).InfoS("Add Bucket",
-"name", bucket.ObjectMeta.Name,
-"bucketclass", bucket.Spec.BucketClassName,
-)
+"name", bucket.ObjectMeta.Name)
+
+if bucket.Spec.BucketClassName == "" {
+err = errors.New(fmt.Sprintf("BucketClassName not defined for bucket %s", bucket.ObjectMeta.Name))
+klog.V(3).ErrorS(err, "BucketClassName not defined")
+return err
+}
 
 if !strings.EqualFold(bucket.Spec.DriverName, b.driverName) {
 klog.V(5).InfoS("Skipping bucket for driver",
@@ -93,6 +98,24 @@ func (b *BucketListener) Add(ctx context.Context, inputBucket *v1alpha1.Bucket)
 if bucket.Spec.ExistingBucketID != "" {
 bucketReady = true
 bucketID = bucket.Spec.ExistingBucketID
+if bucket.Spec.Parameters == nil {
+bucketClass, err := b.bucketClasses().Get(ctx, bucket.Spec.BucketClassName, metav1.GetOptions{})
+if err != nil {
+klog.V(3).ErrorS(err, "Error fetching bucketClass",
+"bucketClass", bucket.Spec.BucketClassName,
+"bucket", bucket.ObjectMeta.Name)
+return err
+}
+
+if bucketClass.Parameters != nil {
+var param map[string]string
+for k, v := range bucketClass.Parameters {
+param[k] = v
+}
+
+bucket.Spec.Parameters = param
+}
+}
 } else {
 req := &cosi.DriverCreateBucketRequest{
 Parameters: bucket.Spec.Parameters,
@@ -110,7 +133,7 @@ func (b *BucketListener) Add(ctx context.Context, inputBucket *v1alpha1.Bucket)
 }
 
 if rsp == nil {
-err = errors.New("DriverCreateBucket returned a nil response")
+err = errors.New(fmt.Sprintf("DriverCreateBucket returned a nil response for bucket: %s", bucket.ObjectMeta.Name))
 klog.V(3).ErrorS(err, "Internal Error from driver",
 "bucket", bucket.ObjectMeta.Name)
 return err
@@ -122,7 +145,7 @@ func (b *BucketListener) Add(ctx context.Context, inputBucket *v1alpha1.Bucket)
 } else {
 klog.V(3).ErrorS(err, "DriverCreateBucket returned an empty bucketID",
 "bucket", bucket.ObjectMeta.Name)
-err = errors.New("DriverCreateBucket returned an empty bucketID")
+err = errors.New(fmt.Sprintf("DriverCreateBucket returned an empty bucketID for bucket: %s",bucket.ObjectMeta.Name))
 return err
 }
 
@@ -245,12 +268,11 @@ func (b *BucketListener) Update(ctx context.Context, old, new *v1alpha1.Bucket)
 func (b *BucketListener) Delete(ctx context.Context, inputBucket *v1alpha1.Bucket) error {
 klog.V(3).InfoS("Delete Bucket",
 "name", inputBucket.ObjectMeta.Name,
-"bucketclass", inputBucket.Spec.BucketClassName,
-)
+"bucketclass", inputBucket.Spec.BucketClassName)
 
 if inputBucket.Spec.BucketClaim != nil {
-klog.V(3).Infof("Removing dependent BucketClaim finalizer")
 ref := inputBucket.Spec.BucketClaim
+klog.V(3).Infof("Removing finalizer of bucketClaim: %s before deleting bucket: %s", ref.Name, inputBucket.ObjectMeta.Name)
 
 bucketClaim, err := b.bucketClaims(ref.Namespace).Get(ctx, ref.Name, metav1.GetOptions{})
 if err != nil {
@@ -261,7 +283,7 @@ func (b *BucketListener) Delete(ctx context.Context, inputBucket *v1alpha1.Bucke
 }
 
 if controllerutil.RemoveFinalizer(bucketClaim, consts.BCFinalizer) {
-_, err := b.bucketClaims(bucketClaim.ObjectMeta.Namespace).UpdateStatus(ctx, bucketClaim, metav1.UpdateOptions{})
+_, err := b.bucketClaims(bucketClaim.ObjectMeta.Namespace).Update(ctx, bucketClaim, metav1.UpdateOptions{})
 if err != nil {
 klog.V(3).ErrorS(err, "Error removing bucketClaim finalizer",
 "bucket", inputBucket.ObjectMeta.Name,
@@ -352,6 +374,13 @@ func (b *BucketListener) buckets() bucketapi.BucketInterface {
 panic("uninitialized listener")
 }
 
+func (b *BucketListener) bucketClasses() bucketapi.BucketClassInterface {
+if b.bucketClient != nil {
+return b.bucketClient.ObjectstorageV1alpha1().BucketClasses()
+}
+panic("uninitialized listener")
+}
+
 func (b *BucketListener) bucketClaims(namespace string) bucketapi.BucketClaimInterface {
 if b.bucketClient != nil {
 return b.bucketClient.ObjectstorageV1alpha1().BucketClaims(namespace)