Merge pull request #2715 from NikitaSkrynnik/fix-4-clusters

qfix: Fix problem with 4 kubeconfigs
networkservicemesh · Apr 27, 2023 · eefdb79 · eefdb79
2 parents a7a007b + 6cd5bf6
commit eefdb79
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/extensions/logs/logs.go b/extensions/logs/logs.go
@@ -153,21 +153,25 @@ func initialize() {
 
 	jobsCh = make(chan func(), config.WorkerCount)
 
-	var kubeConfig = os.Getenv("KUBECONFIG")
+	var singleClusterKubeConfig = os.Getenv("KUBECONFIG")
 
-	if kubeConfig == "" {
-		kubeConfig = filepath.Join(os.Getenv("HOME"), ".kube", "config")
+	if singleClusterKubeConfig == "" {
+		singleClusterKubeConfig = filepath.Join(os.Getenv("HOME"), ".kube", "config")
 	}
 
-	kubeConfigs = []string{kubeConfig}
+	kubeConfigs = []string{}
 
 	for i := 1; i <= config.MaxKubeConfigs; i++ {
-		kubeConfig = os.Getenv("KUBECONFIG" + fmt.Sprint(i))
+		kubeConfig := os.Getenv("KUBECONFIG" + fmt.Sprint(i))
 		if kubeConfig != "" {
 			kubeConfigs = append(kubeConfigs, kubeConfig)
 		}
 	}
 
+	if len(kubeConfigs) == 0 {
+		kubeConfigs = append(kubeConfigs, singleClusterKubeConfig)
+	}
+
 	for _, cfg := range kubeConfigs {
 		kubeconfig, err := clientcmd.BuildConfigFromFlags("", cfg)
 		if err != nil {