modify constants

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

Author: ashimagarg27

controllers/ibmobjectcsi_controller.go

@@ -279,7 +279,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:      oconfig.CSIDaemonSetName,
 		Namespace: instance.Namespace,
 	}, node)
 	return node, err

controllers/ibmobjectcsi_controller_test.go

@@ -156,7 +156,7 @@ var (
 
 	csiNode = &appsv1.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        config.GetNameForResource(config.CSINode, config.DriverPrefix),
+			Name:        config.CSIDaemonSetName,
 			Namespace:   TestNamespace,
 			Annotations: annotations,
 		},

controllers/internal/crutils/ibmobjectcsi.go

@@ -72,7 +72,7 @@ func (c *IBMObjectCSI) GetAnnotations() labels.Set {
 
 // GetCSINodeSelectorLabels ...
 func (c *IBMObjectCSI) GetCSINodeSelectorLabels() labels.Set {
-	return common.GetSelectorLabels(config.CSINode.String())
+	return common.GetSelectorLabels(config.CSINode)
 }
 
 // GetCSINodePodLabels ...

controllers/syncer/csi_node.go

@@ -43,7 +43,7 @@ type csiNodeSyncer struct {
 func NewCSINodeSyncer(c client.Client, driver *crutils.IBMObjectCSI) syncer.Interface {
 	obj := &appsv1.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        config.GetNameForResource(config.CSINode, config.DriverPrefix),
+			Name:        config.CSIDaemonSetName,
 			Namespace:   driver.Namespace,
 			Annotations: driver.GetAnnotations(),
 			Labels:      driver.GetLabels(),
@@ -65,7 +65,7 @@ func NewCSINodeSyncer(c client.Client, driver *crutils.IBMObjectCSI) syncer.Inte
 		obj:    obj,
 	}
 
-	return syncer.NewObjectSyncer(config.CSINode.String(), driver.Unwrap(), obj, c, func() error {
+	return syncer.NewObjectSyncer(config.CSINode, driver.Unwrap(), obj, c, func() error {
 		return sync.SyncFn()
 	})
 }

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/onsi/gomega v1.33.1
 	github.com/presslabs/controller-util v0.10.2
 	github.com/stretchr/testify v1.9.0
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
 	k8s.io/api v0.30.1
 	k8s.io/apimachinery v0.30.1
 	k8s.io/client-go v0.30.1
@@ -54,7 +55,6 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/net v0.25.0 // indirect
 	golang.org/x/oauth2 v0.12.0 // indirect
 	golang.org/x/sys v0.20.0 // indirect

pkg/config/constants.go

@@ -1,6 +1,8 @@
 // Package config ...
 package config
 
+import "time"
+
 // Add a field here if it never changes, if it changes over time, put it to settings.go
 const (
 	APIGroup        = "objectdriver.csi.ibm.com"
@@ -43,6 +45,11 @@ const (
 	NodeRegistrarSocketPath                               = "/var/lib/kubelet/plugins/cos.s3.csi.ibm.io/csi.sock"
 	CSIEndpoint                                           = "unix:///var/lib/csi/sockets/pluginproxy/csi.sock"
 	CSINodeEndpoint                                       = "unix:///csi/csi.sock"
+
+	DefaultLogTailLines    = 300
+	DefaultNamespace       = "default"
+	ReconcilationTime      = 5 * time.Minute
+	TransportEndpointError = "transport endpoint is not connected"
 )
 
 var CommonCSIResourceLabels = map[string]string{