Skip to content

Commit

Permalink
Merge pull request #12381 from jayesh-srivastava/master
Browse files Browse the repository at this point in the history
Updated version.go with crun version
  • Loading branch information
spowelljr authored Sep 9, 2021
2 parents f18c312 + 4551268 commit 3e25ee3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions cmd/minikube/cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ var versionCmd = &cobra.Command{
"buildctl": exec.Command("buildctl", "--version"),
"ctr": exec.Command("ctr", "--version"),
"runc": exec.Command("runc", "--version"),
"crun": exec.Command("crun", "--version"),
}
for k, v := range versionCMDS {
rr, err := runner.RunCmd(v)
Expand Down
2 changes: 1 addition & 1 deletion test/integration/functional_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2137,7 +2137,7 @@ func validateVersionCmd(ctx context.Context, t *testing.T, profile string) {
t.Errorf("error version: %v", err)
}
got := rr.Stdout.String()
for _, c := range []string{"buildctl", "commit", "containerd", "crictl", "crio", "ctr", "docker", "minikubeVersion", "podman", "run"} {
for _, c := range []string{"buildctl", "commit", "containerd", "crictl", "crio", "ctr", "docker", "minikubeVersion", "podman", "run", "crun"} {
if !strings.Contains(got, c) {
t.Errorf("expected to see %q in the minikube version --components but got:\n%s", c, got)
}
Expand Down

0 comments on commit 3e25ee3

Please sign in to comment.