Fix the way 'minikube status' finds the kubecfg file.

kubernetes · Jul 24, 2017 · 24e08b7 · 24e08b7
1 parent 8eaf471
commit 24e08b7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
@@ -183,13 +183,7 @@ func runStart(cmd *cobra.Command, args []string) {
 	fmt.Println("Setting up kubeconfig...")
 	// setup kubeconfig
 
-	kubeConfigEnv := os.Getenv(constants.KubeconfigEnvVar)
-	var kubeConfigFile string
-	if kubeConfigEnv == "" {
-		kubeConfigFile = constants.KubeconfigPath
-	} else {
-		kubeConfigFile = filepath.SplitList(kubeConfigEnv)[0]
-	}
+	kubeConfigFile := cmdUtil.GetKubeConfigPath()
 
 	kubeCfgSetup := &kubeconfig.KubeConfigSetup{
 		ClusterName:          cfg.GetMachineName(),

diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
@@ -72,7 +72,7 @@ var statusCmd = &cobra.Command{
 				glog.Errorln("Error host driver ip status:", err)
 				cmdUtil.MaybeReportErrorAndExit(err)
 			}
-			kstatus, err := kubeconfig.GetKubeConfigStatus(ip, constants.KubeconfigPath, config.GetMachineName())
+			kstatus, err := kubeconfig.GetKubeConfigStatus(ip, cmdUtil.GetKubeConfigPath(), config.GetMachineName())
 			if err != nil {
 				glog.Errorln("Error kubeconfig status:", err)
 				cmdUtil.MaybeReportErrorAndExit(err)

diff --git a/cmd/util/util.go b/cmd/util/util.go
@@ -246,3 +246,11 @@ func KillMountProcess() error {
 	}
 	return mountProc.Kill()
 }
+
+func GetKubeConfigPath() string {
+	kubeConfigEnv := os.Getenv(constants.KubeconfigEnvVar)
+	if kubeConfigEnv == "" {
+		return constants.KubeconfigPath
+	}
+	return filepath.SplitList(kubeConfigEnv)[0]
+}