Switch back to use kube-system as default namespace to look for confi…

…g map of pool Signed-off-by: Lubron Zhan <lubronzhan@gmail.com>
kube-vip · Jan 19, 2024 · 4380fe3 · 4380fe3
1 parent c140aeb
commit 4380fe3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/pkg/provider/loadBalancer.go b/pkg/provider/loadBalancer.go
@@ -30,14 +30,14 @@ const (
 // kubevipLoadBalancerManager -
 type kubevipLoadBalancerManager struct {
 	kubeClient     kubernetes.Interface
-	nameSpace      string
+	namespace      string
 	cloudConfigMap string
 }
 
 func newLoadBalancer(kubeClient kubernetes.Interface, ns, cm string) cloudprovider.LoadBalancer {
 	k := &kubevipLoadBalancerManager{
 		kubeClient:     kubeClient,
-		nameSpace:      ns,
+		namespace:      ns,
 		cloudConfigMap: cm,
 	}
 	return k
@@ -145,11 +145,11 @@ func (k *kubevipLoadBalancerManager) syncLoadBalancer(ctx context.Context, servi
 	}
 
 	// Get the clound controller configuration map
-	controllerCM, err := k.GetConfigMap(ctx, k.cloudConfigMap, k.nameSpace)
+	controllerCM, err := k.GetConfigMap(ctx, k.cloudConfigMap, k.namespace)
 	if err != nil {
-		klog.Errorf("Unable to retrieve kube-vip ipam config from configMap [%s] in %s", k.cloudConfigMap, k.nameSpace)
+		klog.Errorf("Unable to retrieve kube-vip ipam config from configMap [%s] in %s", k.cloudConfigMap, k.namespace)
 		// TODO - determine best course of action, create one if it doesn't exist
-		controllerCM, err = k.CreateConfigMap(ctx, k.cloudConfigMap, k.nameSpace)
+		controllerCM, err = k.CreateConfigMap(ctx, k.cloudConfigMap, k.namespace)
 		if err != nil {
 			return nil, err
 		}

diff --git a/pkg/provider/loadBalancer_test.go b/pkg/provider/loadBalancer_test.go
@@ -864,15 +864,15 @@ func Test_syncLoadBalancer(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			ns := KubeVipClientConfigNamespace
-			cm := KubeVipCloudConfig
+			cm := KubeVipClientConfig
 			if tt.poolConfigMap != nil {
 				ns = tt.poolConfigMap.GetObjectMeta().GetNamespace()
 				cm = tt.poolConfigMap.GetObjectMeta().GetName()
 			}
 
 			mgr := &kubevipLoadBalancerManager{
 				kubeClient:     fake.NewSimpleClientset(),
-				nameSpace:      ns,
+				namespace:      ns,
 				cloudConfigMap: cm,
 			}
 

diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go
@@ -11,6 +11,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/klog"
 
 	cloudprovider "k8s.io/cloud-provider"
 )
@@ -22,9 +23,6 @@ const (
 	//ProviderName is the name of the cloud provider
 	ProviderName = "kubevip"
 
-	//KubeVipCloudConfig is the default name of the load balancer config Map
-	KubeVipCloudConfig = "kubevip"
-
 	//KubeVipClientConfig is the default name of the load balancer config Map
 	KubeVipClientConfig = "kubevip"
 
@@ -51,13 +49,15 @@ func newKubeVipCloudProvider(io.Reader) (cloudprovider.Interface, error) {
 	cm := os.Getenv("KUBEVIP_CONFIG_MAP")
 
 	if cm == "" {
-		cm = KubeVipCloudConfig
+		cm = KubeVipClientConfig
 	}
 
 	if ns == "" {
-		ns = "default"
+		ns = KubeVipClientConfigNamespace
 	}
 
+	klog.Infof("Watching configMap for pool config with name: '%s', namespace: '%s'", cm, ns)
+
 	var cl *kubernetes.Clientset
 	if !OutSideCluster {
 		// This will attempt to load the configuration when running within a POD