Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support minikube 1.13.0 and later with --vm-driver=none #4887

Merged
merged 1 commit into from
Oct 12, 2020
+23 −8
Merged

Support minikube 1.13.0 and later with --vm-driver=none #4887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions pkg/skaffold/docker/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ import (
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/version"
)

const minikubeBadUsageExitCode = 64
// minikube 1.13.0 renumbered exit codes
const minikubeDriverConfictExitCode = 51
const oldMinikubeBadUsageExitCode = 64

// For testing
var (
Expand Down Expand Up @@ -104,9 +106,11 @@ type ExitCoder interface {
func newMinikubeAPIClient(minikubeProfile string) ([]string, client.CommonAPIClient, error) {
env, err := getMinikubeDockerEnv(minikubeProfile)
if err != nil {
// When minikube uses the infamous `none` driver, it'll exit `minikube docker-env` with code 64.
// When minikube uses the infamous `none` driver, `minikube docker-env` will exit with
// code 51 (>= 1.13.0) or 64 (< 1.13.0). Note that exit code 51 was unused prior to 1.13.0
// so it is safe to check here without knowing the minikube version.
var exitError ExitCoder
if errors.As(err, &exitError) && exitError.ExitCode() == minikubeBadUsageExitCode {
if errors.As(err, &exitError) && (exitError.ExitCode() == minikubeDriverConfictExitCode || exitError.ExitCode() == oldMinikubeBadUsageExitCode) {
// Let's ignore the error and fall back to local docker daemon.
logrus.Warnf("Could not get minikube docker env, falling back to local docker daemon: %s", err)
return newEnvAPIClient()
Expand Down
21 changes: 16 additions & 5 deletions pkg/skaffold/docker/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,12 @@ DOCKER_HOST`),
shouldErr: true,
},
{
description: "minikube exit code 64 - fallback to host docker",
command: testutil.CmdRunOutErr("minikube docker-env --shell none -p minikube", "", fmt.Errorf("fail: %w", &badUsageErr{})),
description: "minikube exit code 64 (minikube < 1.13.0) - fallback to host docker",
command: testutil.CmdRunOutErr("minikube docker-env --shell none -p minikube", "", fmt.Errorf("fail: %w", &oldBadUsageErr{})),
},
{
description: "minikube exit code 51 (minikube >= 1.13.0) - fallback to host docker",
command: testutil.CmdRunOutErr("minikube docker-env --shell none -p minikube", "", fmt.Errorf("fail: %w", &driverConflictErr{})),
},
}
for _, test := range tests {
Expand All @@ -152,10 +156,17 @@ DOCKER_HOST`),
}
}

type badUsageErr struct{}
// minikube < 1.13.0 returns exit code 64 (BadUsage) on `minikube docker-env` with driver `none`
type oldBadUsageErr struct{}

func (e *oldBadUsageErr) Error() string { return "bad usage" }
func (e *oldBadUsageErr) ExitCode() int { return 64 }

// minikube >= 1.13.0 returns exit code 51 (ExDriverConfict) on `minikube docker-env` with driver `none`
type driverConflictErr struct{}

func (e *badUsageErr) Error() string { return "bad usage" }
func (e *badUsageErr) ExitCode() int { return 64 }
func (e *driverConflictErr) Error() string { return "driver conflict" }
func (e *driverConflictErr) ExitCode() int { return 51 }

type fakeMinikubeClient struct{}

Expand Down