minikube version: add --components flag to list all included software

cmd/minikube/cmd/version.go

@@ -18,18 +18,23 @@ package cmd
 
 import (
 	"encoding/json"
+	"os/exec"
+	"strings"
 
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
+	"k8s.io/klog/v2"
 	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/reason"
 	"k8s.io/minikube/pkg/version"
 )
 
 var (
-	versionOutput string
-	shortVersion  bool
+	versionOutput          string
+	shortVersion           bool
+	listComponentsVersions bool
 )
 
 var versionCmd = &cobra.Command{
@@ -43,13 +48,49 @@ var versionCmd = &cobra.Command{
 			"minikubeVersion": minikubeVersion,
 			"commit":          gitCommitID,
 		}
+
+		if listComponentsVersions && !shortVersion {
+			co := mustload.Running(ClusterFlagValue())
+			runner := co.CP.Runner
+			versionCMDS := map[string]*exec.Cmd{
+				"docker":     exec.Command("docker", "version", "--format={{.Client.Version}}"),
+				"containerd": exec.Command("containerd", "--version"),
+				"crio":       exec.Command("crio", "version"),
+				"podman":     exec.Command("sudo", "podman", "version"),
+				"crictl":     exec.Command("sudo", "crictl", "version"),
+				"buildctl":   exec.Command("buildctl", "--version"),
+				"ctr":        exec.Command("sudo", "ctr", "version"),
+				"runc":       exec.Command("runc", "--version"),
+			}
+			for k, v := range versionCMDS {
+				rr, err := runner.RunCmd(v)
+				if err != nil {
+					klog.Warningf("error getting %s's version: %v", k, err)
+					data[k] = "error"
+				} else {
+					data[k] = strings.TrimSpace(rr.Stdout.String())
+				}
+
+			}
+
+		}
+
 		switch versionOutput {
 		case "":
 			if !shortVersion {
 				out.Ln("minikube version: %v", minikubeVersion)
 				if gitCommitID != "" {
 					out.Ln("commit: %v", gitCommitID)
 				}
+				for k, v := range data {
+					// for backward compatibility we keep displaying the old way for these two
+					if k == "minikubeVersion" || k == "commit" {
+						continue
+					}
+					if v != "" {
+						out.Ln("\n%s:\n%s", k, v)
+					}
+				}
 			} else {
 				out.Ln("%v", minikubeVersion)
 			}
@@ -74,4 +115,5 @@ var versionCmd = &cobra.Command{
 func init() {
 	versionCmd.Flags().StringVarP(&versionOutput, "output", "o", "", "One of 'yaml' or 'json'.")
 	versionCmd.Flags().BoolVar(&shortVersion, "short", false, "Print just the version number.")
+	versionCmd.Flags().BoolVar(&listComponentsVersions, "components", false, "list versions of all components included with minikube. (the cluster must be running)")
 }

test/integration/functional_test.go

@@ -45,6 +45,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/reason"
 	"k8s.io/minikube/pkg/util/retry"
 
+	"github.com/blang/semver/v4"
 	"github.com/elazarl/goproxy"
 	"github.com/hashicorp/go-retryablehttp"
 	"github.com/otiai10/copy"
@@ -154,6 +155,7 @@ func TestFunctional(t *testing.T) {
 			{"BuildImage", validateBuildImage},
 			{"ListImages", validateListImages},
 			{"NonActiveRuntimeDisabled", validateNotActiveRuntimeDisabled},
+			{"Version", validateVersionCmd},
 		}
 		for _, tc := range tests {
 			tc := tc
@@ -1879,3 +1881,36 @@ func startMinikubeWithProxy(ctx context.Context, t *testing.T, profile string, p
 		t.Errorf("start stderr=%s, want: *%s*", rr.Stderr.String(), want)
 	}
 }
+
+// validateVersionCmd asserts `minikube version` command works fine for both --short and --components
+func validateVersionCmd(ctx context.Context, t *testing.T, profile string) {
+
+	t.Run("short", func(t *testing.T) {
+		MaybeParallel(t)
+		rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "version", "--short"))
+		if err != nil {
+			t.Errorf("failed to get version --short: %v", err)
+		}
+
+		_, err = semver.Make(strings.TrimSpace(strings.Trim(rr.Stdout.String(), "v")))
+		if err != nil {
+			t.Errorf("failed to get a valid semver for minikube version --short:%s %v", rr.Output(), err)
+		}
+	})
+
+	t.Run("components", func(t *testing.T) {
+		MaybeParallel(t)
+		rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "version", "-o=json", "--components"))
+		if err != nil {
+			t.Errorf("error version: %v", err)
+		}
+		got := rr.Stdout.String()
+		for _, c := range []string{"buildctl", "commit", "containerd", "crictl", "crio", "ctr", "docker", "minikubeVersion", "podman", "run"} {
+			if !strings.Contains(got, c) {
+				t.Errorf("expected to see %q in the minikube version --components but got:\n%s", c, got)
+			}
+
+		}
+	})
+
+}