add docker-env to minikube status

Signed-off-by: Tharun <[email protected]>
kubernetes · Mar 19, 2021 · ef55afb · ef55afb
1 parent 63a8f28
commit ef55afb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go
@@ -252,11 +252,13 @@ var dockerEnvCmd = &cobra.Command{
 		sh := shell.EnvConfig{
 			Shell: shl,
 		}
-
+		cname := ClusterFlagValue()
+		co := mustload.Running(cname)
 		if dockerUnset {
 			if err := dockerUnsetScript(DockerEnvConfig{EnvConfig: sh}, os.Stdout); err != nil {
 				exit.Error(reason.InternalEnvScript, "Error generating unset output", err)
 			}
+			co.Config.DockerEnvInUse = false
 			return
 		}
 
@@ -265,8 +267,6 @@ var dockerEnvCmd = &cobra.Command{
 			exit.SetShell(true)
 		}
 
-		cname := ClusterFlagValue()
-		co := mustload.Running(cname)
 		driverName := co.CP.Host.DriverName
 
 		if driverName == driver.None {
@@ -355,6 +355,7 @@ var dockerEnvCmd = &cobra.Command{
 				exit.Error(reason.IfSSHClient, "Error with ssh-add", err)
 			}
 		}
+		co.Config.DockerEnvInUse = true
 	},
 }
 

diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
@@ -136,6 +136,7 @@ type Status struct {
 	Kubeconfig string
 	Worker     bool
 	TimeToStop string
+	DockerEnv  string
 }
 
 // ClusterState holds a cluster state representation
@@ -183,6 +184,9 @@ kubelet: {{.Kubelet}}
 apiserver: {{.APIServer}}
 kubeconfig: {{.Kubeconfig}}
 timeToStop: {{.TimeToStop}}
+{{- if .DockerEnv }}
+docker-env: in-use
+{{- end }}
 
 `
 	workerStatusFormat = `{{.Name}}
@@ -374,6 +378,9 @@ func nodeStatus(api libmachine.API, cc config.ClusterConfig, n config.Node) (*St
 		initiationTime := time.Unix(cc.ScheduledStop.InitiationTime, 0)
 		st.TimeToStop = time.Until(initiationTime.Add(cc.ScheduledStop.Duration)).String()
 	}
+	if cc.DockerEnvInUse {
+		st.DockerEnv = "in-use"
+	}
 	// Early exit for worker nodes
 	if !controlPlane {
 		return st, nil

diff --git a/cmd/minikube/cmd/status_test.go b/cmd/minikube/cmd/status_test.go
@@ -51,8 +51,8 @@ func TestStatusText(t *testing.T) {
 	}{
 		{
 			name:  "ok",
-			state: &Status{Name: "minikube", Host: "Running", Kubelet: "Running", APIServer: "Running", Kubeconfig: Configured, TimeToStop: "10m"},
-			want:  "minikube\ntype: Control Plane\nhost: Running\nkubelet: Running\napiserver: Running\nkubeconfig: Configured\ntimeToStop: 10m\n\n",
+			state: &Status{Name: "minikube", Host: "Running", Kubelet: "Running", APIServer: "Running", Kubeconfig: Configured, TimeToStop: "10m", DockerEnv: "in-use"},
+			want:  "minikube\ntype: Control Plane\nhost: Running\nkubelet: Running\napiserver: Running\nkubeconfig: Configured\ntimeToStop: 10m\ndocker-env: in-use\n\n",
 		},
 		{
 			name:  "paused",

diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go
@@ -81,6 +81,7 @@ type ClusterConfig struct {
 	ListenAddress           string   // Only used by the docker and podman driver
 	Network                 string   // only used by docker driver
 	MultiNodeRequested      bool
+	DockerEnvInUse          bool
 }
 
 // KubernetesConfig contains the parameters used to configure the VM Kubernetes.

diff --git a/site/content/en/docs/commands/status.md b/site/content/en/docs/commands/status.md
@@ -23,7 +23,7 @@ minikube status [flags]
 
 ```
   -f, --format string         Go template format string for the status output.  The format for Go templates can be found here: https://golang.org/pkg/text/template/
-                              For the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status (default "{{.Name}}\ntype: Control Plane\nhost: {{.Host}}\nkubelet: {{.Kubelet}}\napiserver: {{.APIServer}}\nkubeconfig: {{.Kubeconfig}}\ntimeToStop: {{.TimeToStop}}\n\n")
+                              For the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status (default "{{.Name}}\ntype: Control Plane\nhost: {{.Host}}\nkubelet: {{.Kubelet}}\napiserver: {{.APIServer}}\nkubeconfig: {{.Kubeconfig}}\ntimeToStop: {{.TimeToStop}}\n{{- if .DockerEnv }}\ndocker-env: in-use\n{{- end }}\n\n")
   -l, --layout string         output layout (EXPERIMENTAL, JSON only): 'nodes' or 'cluster' (default "nodes")
   -n, --node string           The node to check status for. Defaults to control plane. Leave blank with default format for status on all nodes.
   -o, --output string         minikube status --output OUTPUT. json, text (default "text")