Merge pull request #36 from IBM/fix-error

Fix constant error

Author: ambiknai

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2024-06-25T08:10:41Z",
+  "generated_at": "2024-06-27T06:33:16Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"

controllers/constants/constants.go

@@ -71,13 +71,10 @@ const (
 	CSINodeSCCClusterRole                 = "node-scc-clusterrole"
 	CSINodeSCCClusterRoleBinding          = "node-scc-clusterrolebinding"
 
+	ResourceReqLimitsConfigMap = "cos-csi-driver-configmap"
+	ObjectCSIDriver            = "ibm-object-csi"
 
-	StorageClassNamePrefix = "ibm-object-storage"
-	RetainPolicyTag        = "retain"
-
-	ResourceReqLimitsConfigMap      = "cos-csi-driver-configmap"
-	ObjectCSIDriverOperatorDeployNS = "ibm-object-csi-operator"
-	ObjectCSIDriver                 = "ibm-object-csi"
+	RetainPolicyTag = "retain"
 
 	StorageClassPrefix = "ibm-object-storage"
 

controllers/ibmobjectcsi_controller.go

@@ -224,7 +224,7 @@ func (r *IBMObjectCSIReconciler) handleConfigMapReconcile(ctx context.Context, r
 	instance := &objectdriverv1alpha1.IBMObjectCSI{}
 
 	err = r.Get(ctx, types.NamespacedName{
-		Namespace: constants.ObjectCSIDriverOperatorDeployNS,
+		Namespace: constants.CSIOperatorNamespace,
 		Name:      constants.ObjectCSIDriver},
 		instance)
 	if err != nil {
@@ -549,7 +549,7 @@ func (r *IBMObjectCSIReconciler) getStorageClasses(instance *crutils.IBMObjectCS
 	cosRegion := r.ControllerHelper.GetRegion()
 	cosEP := r.ControllerHelper.GetCosEP()
 	s3Provider := r.ControllerHelper.GetS3Provider()
-	scNamePrefix := constants.StorageClassNamePrefix
+	scNamePrefix := constants.StorageClassPrefix
 
 	k8sSCs := []*storagev1.StorageClass{}
 	cosSCs := []string{}

controllers/ibmobjectcsi_controller_test.go

@@ -343,7 +343,7 @@ var (
 
 	rCloneSC = &storagev1.StorageClass{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: fmt.Sprintf("%s-standard-rclone", constants.StorageClassNamePrefix),
+			Name: fmt.Sprintf("%s-standard-rclone", constants.StorageClassPrefix),
 		},
 		Provisioner:   constants.DriverName,
 		ReclaimPolicy: &reclaimPolicyDelete,
@@ -370,7 +370,7 @@ var (
 
 	rCloneRetainSC = &storagev1.StorageClass{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: fmt.Sprintf("%s-standard-rclone-retain", constants.StorageClassNamePrefix),
+			Name: fmt.Sprintf("%s-standard-rclone-retain", constants.StorageClassPrefix),
 		},
 		Provisioner:   constants.DriverName,
 		ReclaimPolicy: &reclaimPolicyRetain,
@@ -397,7 +397,7 @@ var (
 
 	s3fsSC = &storagev1.StorageClass{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: fmt.Sprintf("%s-standard-s3fs", constants.StorageClassNamePrefix),
+			Name: fmt.Sprintf("%s-standard-s3fs", constants.StorageClassPrefix),
 		},
 		Provisioner:   constants.DriverName,
 		ReclaimPolicy: &reclaimPolicyDelete,
@@ -421,7 +421,7 @@ var (
 
 	s3fsRetainSC = &storagev1.StorageClass{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: fmt.Sprintf("%s-standard-s3fs-retain", constants.StorageClassNamePrefix),
+			Name: fmt.Sprintf("%s-standard-s3fs-retain", constants.StorageClassPrefix),
 		},
 		Provisioner:   constants.DriverName,
 		ReclaimPolicy: &reclaimPolicyRetain,

controllers/test_variables.go

@@ -42,7 +42,7 @@ var (
 	testDeploymentNamespace = "default"
 	testPVName1             = "test-pv-1"
 	testPVCName1            = "test-pvc-1"
-	testStorageClassName    = constants.StorageClassPrefix + "test" + constants.StorageClassSuffix
+	testStorageClassName    = constants.StorageClassPrefix + "test"
 	testNode1               = "test-node-1"
 	testNode2               = "test-node-2"
 	testNode3               = "test-node-3"