update constants files

Signed-off-by: Ashima-Ashima1 <[email protected]>

Author: ashimagarg27

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2024-05-15T04:17:59Z",
+  "generated_at": "2024-06-03T09:31:24Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"

pkg/config/constants.go renamed to controllers/constants/constants.go

@@ -1,5 +1,5 @@
-// Package config ...
-package config
+// Package constants ...
+package constants
 
 // Add a field here if it never changes, if it changes over time, put it to settings.go
 const (

pkg/config/resources.go renamed to controllers/constants/resources.go

@@ -1,5 +1,5 @@
-// Package config ...
-package config
+// Package constants ...
+package constants
 
 import (
 	"fmt"

controllers/ibmobjectcsi_controller.go

@@ -25,10 +25,10 @@ import (
 	"time"
 
 	objectdriverv1alpha1 "github.com/IBM/ibm-object-csi-driver-operator/api/v1alpha1"
+	"github.com/IBM/ibm-object-csi-driver-operator/controllers/constants"
 	crutils "github.com/IBM/ibm-object-csi-driver-operator/controllers/internal/crutils"
 	clustersyncer "github.com/IBM/ibm-object-csi-driver-operator/controllers/syncer"
 	"github.com/IBM/ibm-object-csi-driver-operator/controllers/util/common"
-	oconfig "github.com/IBM/ibm-object-csi-driver-operator/pkg/config"
 	oversion "github.com/IBM/ibm-object-csi-driver-operator/version"
 	"github.com/go-logr/logr"
 	"github.com/presslabs/controller-util/pkg/syncer"
@@ -282,7 +282,7 @@ func (r *IBMObjectCSIReconciler) isNodeReady(node *appsv1.DaemonSet) bool {
 func (r *IBMObjectCSIReconciler) getNodeDaemonSet(instance *crutils.IBMObjectCSI) (*appsv1.DaemonSet, error) {
 	node := &appsv1.DaemonSet{}
 	err := r.Get(context.TODO(), types.NamespacedName{
-		Name:      oconfig.GetNameForResource(oconfig.CSINode, oconfig.DriverPrefix),
+		Name:      constants.GetNameForResource(constants.CSINode, constants.DriverPrefix),
 		Namespace: instance.Namespace,
 	}, node)
 	return node, err
@@ -291,7 +291,7 @@ func (r *IBMObjectCSIReconciler) getNodeDaemonSet(instance *crutils.IBMObjectCSI
 func (r *IBMObjectCSIReconciler) getControllerDeployment(instance *crutils.IBMObjectCSI) (*appsv1.Deployment, error) {
 	controllerDeployment := &appsv1.Deployment{}
 	err := r.Get(context.TODO(), types.NamespacedName{
-		Name:      oconfig.GetNameForResource(oconfig.CSIController, oconfig.DriverPrefix),
+		Name:      constants.GetNameForResource(constants.CSIController, constants.DriverPrefix),
 		Namespace: instance.Namespace,
 	}, controllerDeployment)
 	return controllerDeployment, err
@@ -318,8 +318,8 @@ func (r *IBMObjectCSIReconciler) reconcileServiceAccount(instance *crutils.IBMOb
 	controller := instance.GenerateControllerServiceAccount()
 	node := instance.GenerateNodeServiceAccount()
 
-	controllerServiceAccountName := oconfig.GetNameForResource(oconfig.CSIControllerServiceAccount, oconfig.DriverPrefix)
-	nodeServiceAccountName := oconfig.GetNameForResource(oconfig.CSINodeServiceAccount, oconfig.DriverPrefix)
+	controllerServiceAccountName := constants.GetNameForResource(constants.CSIControllerServiceAccount, constants.DriverPrefix)
+	nodeServiceAccountName := constants.GetNameForResource(constants.CSINodeServiceAccount, constants.DriverPrefix)
 
 	for _, sa := range []*corev1.ServiceAccount{
 		controller,
@@ -373,7 +373,7 @@ func (r *IBMObjectCSIReconciler) reconcileServiceAccount(instance *crutils.IBMOb
 }
 
 func (r *IBMObjectCSIReconciler) rolloutRestartNode(node *appsv1.DaemonSet) error {
-	restartedAt := fmt.Sprintf("%s/restartedAt", oconfig.APIGroup)
+	restartedAt := fmt.Sprintf("%s/restartedAt", constants.APIGroup)
 	timestamp := time.Now().String()
 	node.Spec.Template.ObjectMeta.Annotations[restartedAt] = timestamp
 	return r.Update(context.TODO(), node)
@@ -472,11 +472,11 @@ func (r *IBMObjectCSIReconciler) getClusterRoleBindings(instance *crutils.IBMObj
 }
 
 func (r *IBMObjectCSIReconciler) getStorageClasses(instance *crutils.IBMObjectCSI) []*storagev1.StorageClass {
-	rcloneRetainSC := instance.GenerateRcloneSC(oconfig.RcloneRetainStorageClass, corev1.PersistentVolumeReclaimRetain)
-	rcloneSC := instance.GenerateRcloneSC(oconfig.RcloneStorageClass, corev1.PersistentVolumeReclaimDelete)
+	rcloneRetainSC := instance.GenerateRcloneSC(constants.RcloneRetainStorageClass, corev1.PersistentVolumeReclaimRetain)
+	rcloneSC := instance.GenerateRcloneSC(constants.RcloneStorageClass, corev1.PersistentVolumeReclaimDelete)
 
-	s3fsRetainSC := instance.GenerateS3fsSC(oconfig.S3fsRetainStorageClass, corev1.PersistentVolumeReclaimRetain)
-	s3fsSC := instance.GenerateS3fsSC(oconfig.S3fsStorageClass, corev1.PersistentVolumeReclaimDelete)
+	s3fsRetainSC := instance.GenerateS3fsSC(constants.S3fsRetainStorageClass, corev1.PersistentVolumeReclaimRetain)
+	s3fsSC := instance.GenerateS3fsSC(constants.S3fsStorageClass, corev1.PersistentVolumeReclaimDelete)
 
 	return []*storagev1.StorageClass{
 		rcloneRetainSC,

controllers/ibmobjectcsi_controller_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/IBM/ibm-object-csi-driver-operator/api/v1alpha1"
+	config "github.com/IBM/ibm-object-csi-driver-operator/controllers/constants"
 	fakecreate "github.com/IBM/ibm-object-csi-driver-operator/controllers/fake/client_create"
 	fakedelete "github.com/IBM/ibm-object-csi-driver-operator/controllers/fake/client_delete"
 	fakeget "github.com/IBM/ibm-object-csi-driver-operator/controllers/fake/client_get"
@@ -15,9 +16,8 @@ import (
 	fakeupdateibmobjcsi "github.com/IBM/ibm-object-csi-driver-operator/controllers/fake/client_update/ibmobjectcsi"
 	crutils "github.com/IBM/ibm-object-csi-driver-operator/controllers/internal/crutils"
 	"github.com/IBM/ibm-object-csi-driver-operator/controllers/syncer"
+	"github.com/IBM/ibm-object-csi-driver-operator/controllers/util"
 	"github.com/IBM/ibm-object-csi-driver-operator/controllers/util/common"
-	"github.com/IBM/ibm-object-csi-driver-operator/pkg/config"
-	"github.com/IBM/ibm-object-csi-driver-operator/pkg/util/boolptr"
 	"github.com/stretchr/testify/assert"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -189,8 +189,8 @@ var (
 			Labels: map[string]string{"app.kubernetes.io/name": "ibm-object-csi"},
 		},
 		Spec: storagev1.CSIDriverSpec{
-			AttachRequired: boolptr.False(),
-			PodInfoOnMount: boolptr.True(),
+			AttachRequired: util.False(),
+			PodInfoOnMount: util.True(),
 			FSGroupPolicy:  &defaultFSGroupPolicy,
 		},
 	}

controllers/internal/crutils/ibmobjectcsi.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	objectdriverv1alpha1 "github.com/IBM/ibm-object-csi-driver-operator/api/v1alpha1"
+	config "github.com/IBM/ibm-object-csi-driver-operator/controllers/constants"
 	"github.com/IBM/ibm-object-csi-driver-operator/controllers/internal/common"
-	"github.com/IBM/ibm-object-csi-driver-operator/pkg/config"
 	csiversion "github.com/IBM/ibm-object-csi-driver-operator/version"
 	"k8s.io/apimachinery/pkg/labels"
 )