Fix error when KUBECONFIG has empty entries (#4100)

Signed-off-by: Carlos Sanchez <[email protected]>
kubernetes · Aug 14, 2019 · 58de23f · 58de23f
1 parent 25e057c
commit 58de23f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/pkg/minikube/kubeconfig/kubeconfig.go b/pkg/minikube/kubeconfig/kubeconfig.go
@@ -87,7 +87,14 @@ func PathFromEnv() string {
 	if kubeConfigEnv == "" {
 		return constants.KubeconfigPath
 	}
-	return filepath.SplitList(kubeConfigEnv)[0]
+	kubeConfigFiles := filepath.SplitList(kubeConfigEnv)
+	for _, kubeConfigFile := range kubeConfigFiles {
+		if kubeConfigFile != "" {
+			return kubeConfigFile
+		}
+		glog.Infof("Ignoring empty entry in %s env var", constants.KubeconfigEnvVar)
+	}
+	return constants.KubeconfigPath
 }
 
 // extractIP returns the IP address stored for minikube in the kubeconfig specified

diff --git a/pkg/minikube/kubeconfig/kubeconfig_test.go b/pkg/minikube/kubeconfig/kubeconfig_test.go
@@ -555,11 +555,23 @@ func TestGetKubeConfigPath(t *testing.T) {
 			input: "/home/fake/.kube/.kubeconfig:/home/fake2/.kubeconfig",
 			want:  "/home/fake/.kube/.kubeconfig",
 		},
+		{
+			input: ":/home/fake/.kube/.kubeconfig:/home/fake2/.kubeconfig",
+			want:  "/home/fake/.kube/.kubeconfig",
+		},
+		{
+			input: ":",
+			want:  "$HOME/.kube/config",
+		},
+		{
+			input: "",
+			want:  "$HOME/.kube/config",
+		},
 	}
 
 	for _, test := range tests {
 		os.Setenv(clientcmd.RecommendedConfigPathEnvVar, test.input)
-		if result := PathFromEnv(); result != test.want {
+		if result := PathFromEnv(); result != os.ExpandEnv(test.want) {
 			t.Errorf("Expected first splitted chunk, got: %s", result)
 		}
 	}