update configmap name and CR name as constants

Author: Bhagyashreek8

config/samples/resource_req_limit_configmap.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: cos-csi-driver-configmap
-  namespace: ibm-object-csi-operator-system
+  namespace: ibm-object-csi-operator
 data:
   ReconcileStorageClasses: "true"
   #Resource Requests per container

controllers/constants/constants.go

@@ -60,8 +60,6 @@ const (
 	HealthPortName   = "healthz"
 	HealthPortNumber = 9808
 
-	DriverPrefix = "ibm-object-csi"
-
 	CSIController                         = "controller"
 	CSINode                               = "node"
 	CSIControllerServiceAccount           = "controller-sa"
@@ -74,7 +72,7 @@ const (
 	CSINodeSCCClusterRoleBinding          = "node-scc-clusterrolebinding"
 
 	ResourceReqLimitsConfigMap      = "cos-csi-driver-configmap"
-	ObjectCSIDriverOperatorDeployNS = "ibm-object-csi-operator-system"
+	ObjectCSIDriverOperatorDeployNS = "ibm-object-csi-operator"
 	ObjectCSIDriver                 = "ibm-object-csi"
 
 	StorageClassPrefix = "ibm-object-storage-"
@@ -98,5 +96,5 @@ var CommonCSIResourceLabels = map[string]string{
 
 // GetResourceName returns the name of a resource for a CSI driver
 func GetResourceName(name string) string {
-	return fmt.Sprintf("%s-%s", DriverPrefix, name)
+	return fmt.Sprintf("%s-%s", ObjectCSIDriver, name)
 }

controllers/ibmobjectcsi_controller_test.go

@@ -185,7 +185,7 @@ var (
 	csiDriver = &storagev1.CSIDriver{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   constants.DriverName,
-			Labels: map[string]string{"app.kubernetes.io/name": constants.DriverPrefix},
+			Labels: map[string]string{"app.kubernetes.io/name": constants.ObjectCSIDriver},
 		},
 		Spec: storagev1.CSIDriverSpec{
 			AttachRequired: util.False(),

controllers/internal/crutils/static_resource_generator.go

@@ -18,7 +18,7 @@ func (c *IBMObjectCSI) GenerateCSIDriver() *storagev1.CSIDriver {
 		ObjectMeta: metav1.ObjectMeta{
 			Name: constants.DriverName,
 			Labels: map[string]string{
-				"app.kubernetes.io/name":       constants.DriverPrefix,
+				"app.kubernetes.io/name":       constants.ObjectCSIDriver,
 				"app.kubernetes.io/part-of":    constants.CSIDriverName,
 				"app.kubernetes.io/managed-by": constants.CSIOperatorName,
 			},