Introducing the const pkg

Author: mukhoakash

pkg/bucket/bucket_controller.go

@@ -27,6 +27,7 @@ import (
 	"sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
 	buckets "sigs.k8s.io/container-object-storage-interface-api/clientset"
 	bucketapi "sigs.k8s.io/container-object-storage-interface-api/clientset/typed/objectstorage.k8s.io/v1alpha1"
+	"sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/const"
 	cosi "sigs.k8s.io/container-object-storage-interface-spec"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
@@ -35,10 +36,6 @@ import (
 	"google.golang.org/grpc/status"
 )
 
-const (
-	bcFinalizer = "cosi.objectstorage.k8s.io/bucketclaim-protection"
-)
-
 // BucketListener manages Bucket objects
 type BucketListener struct {
 	provisionerClient cosi.ProvisionerClient
@@ -155,7 +152,7 @@ func (b *BucketListener) Update(ctx context.Context, old, new *v1alpha1.Bucket)
 	klog.V(3).InfoS("Update Bucket",
 		"name", old.Name)
 
-	if !new.GetDeletionTimestamp.IsZero() {
+	if !new.GetDeletionTimestamp().IsZero() {
 		if len(new.ObjectMeta.Finalizers) > 0 {
 			bucketClaimNs := new.Spec.BucketClaim.Namespace
 			bucketClaimName := new.Spec.BucketClaim.Name
@@ -219,7 +216,7 @@ func (b *BucketListener) Delete(ctx context.Context, inputBucket *v1alpha1.Bucke
 			return err
 		}
 
-		if controllerutil.RemoveFinalizer(bucketClaim, bcFinalizer) {
+		if controllerutil.RemoveFinalizer(bucketClaim, const.BcFinalizer) {
 			if _, err := b.BucketClaims(bucketClaim.Namespace).Update(ctx, bucketClaim, metav1.UpdateOptions{}); err != nil {
 				return err
 			}

pkg/bucketaccess/bucketaccess_controller.go

@@ -33,19 +33,14 @@ import (
 	"sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
 	buckets "sigs.k8s.io/container-object-storage-interface-api/clientset"
 	bucketapi "sigs.k8s.io/container-object-storage-interface-api/clientset/typed/objectstorage.k8s.io/v1alpha1"
+	"sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/const"
 	cosi "sigs.k8s.io/container-object-storage-interface-spec"
 
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
 
-const (
-	accountNamePrefix = "ba-"
-	baFinalizer = "cosi.objectstorage.k8s.io/bucketaccess-protection-"
-	secretFinalizer = "cosi.objectstorage.k8s.io/secret-protection"
-)
-
 // BucketAccessListener manages Bucket objects
 type BucketAccessListener struct {
 	provisionerClient cosi.ProvisionerClient
@@ -155,7 +150,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a
 		return errors.New("BucketAccess can't be granted to bucket not in Ready state and without a bucketID")
 	}
 
-	accountName := accountNamePrefix + string(bucketAccess.UID)
+	accountName := const.AccountNamePrefix + string(bucketAccess.UID)
 
 	req := &cosi.DriverGrantBucketAccessRequest{
 		BucketId:     bucket.Status.BucketID,
@@ -214,7 +209,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      secretCredName,
 				Namespace: namespace,
-				Finalizers: []string{secretFinalizer},
+				Finalizers: []string{const.SecretFinalizer},
 			},
 			StringData: map[string]string{
 				BucketInfo: string(stringData),
@@ -231,7 +226,7 @@ func (bal *BucketAccessListener) Add(ctx context.Context, inputBucketAccess *v1a
 		}
 	}
 
-	bucketFinalizer := baFinalizer + string(bucketAccess.ObjectMeta.UID)
+	bucketFinalizer := const.BaFinalizer + string(bucketAccess.ObjectMeta.UID)
 	finalizers := bucket.ObjectMeta.Finalizers
 	finalizers = append(finalizers, bucketFinalizer)
 	bucket.ObjectMeta.Finalizers = finalizers
@@ -281,7 +276,7 @@ func (bal *BucketAccessListener) Delete(ctx context.Context, bucketAccess *v1alp
 		return err
 	}
 
-	if controllerutil.RemoveFinalizer(secret, secretFinalizer) {
+	if controllerutil.RemoveFinalizer(secret, const.SecretFinalizer) {
 		_, err = bal.Secrets(bucketAccess.ObjectMeta.Namespace).Update(ctx, credSecretName, metav1.UpdateOptions{})
 		if err != nil {
 			return err
@@ -299,7 +294,7 @@ func (bal *BucketAccessListener) Delete(ctx context.Context, bucketAccess *v1alp
 		return err
 	}
 
-	bucketFinalizer := baFinalizer + string(bucketAccess.ObjectMeta.UID)
+	bucketFinalizer := const.BaFinalizer + string(bucketAccess.ObjectMeta.UID)
 	if controllerutil.RemoveFinalizer(bucketFinalizer) {
 		_, err = bal.Buckets().Update(ctx, bucket, metav1.UpdateOptions{})
 		if err != nil {

pkg/const/const.go

@@ -0,0 +1,23 @@
+/* Copyright 2022 The Kubernetes Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package const
+
+const (
+    AccountNamePrefix = "ba-"
+    BaFinalizer = "cosi.objectstorage.k8s.io/bucketaccess-protection-"
+    BcFinalizer = "cosi.objectstorage.k8s.io/bucketclaim-protection"
+    SecretFinalizer = "cosi.objectstorage.k8s.io/secret-protection"
+)