Unset the current-context after minikube stop

cmd/minikube/cmd/stop.go

@@ -30,6 +30,8 @@ import (
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
 	pkgutil "k8s.io/minikube/pkg/util"
+	"k8s.io/minikube/pkg/minikube/constants"
+
 )
 
 // stopCmd represents the stop command
@@ -69,6 +71,12 @@ itself, leaving all files intact. The cluster can be started again with the "sta
 		if err := cmdUtil.KillMountProcess(); err != nil {
 			exit.WithError("Unable to kill mount process", err)
 		}
+
+		machineName := pkg_config.GetMachineName()
+		err = pkgutil.UnsetCurrentContext( constants.KubeconfigPath, machineName)
+		if err != nil {
+			exit.WithError("update config", err)
+		}
 	},
 }
 

pkg/util/kubeconfig.go

@@ -115,6 +115,7 @@ func PopulateKubeConfig(cfg *KubeConfigSetup, kubecfg *api.Config) error {
 	// Only set current context to minikube if the user has not used the keepContext flag
 	if !cfg.KeepContext {
 		kubecfg.CurrentContext = cfg.ClusterName
+		//kubecfg.CurrentContext = ""
 	}
 
 	return nil
@@ -312,3 +313,16 @@ func GetPortFromKubeConfig(filename, machineName string) (int, error) {
 	port, err := strconv.Atoi(kport)
 	return port, err
 }
+
+//UnsetCurrentContext unsets the current-context from minikube to "" on minikube stop
+func UnsetCurrentContext(filename, machineName string)  error {
+	confg, err := ReadConfigOrNew(filename)
+	if err != nil {
+		return  errors.Wrap(err, "Error getting kubeconfig status")
+	}
+	confg.CurrentContext = ""
+	if err := WriteConfig(confg,filename); err != nil {
+		return  errors.Wrap(err, "writing kubeconfig")
+	}
+	return nil
+}