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.

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

make docker driver highly preferred #8623

Merged
merged 1 commit into from
Jul 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions pkg/minikube/registry/drvs/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,12 @@ import (
var docURL = "https://minikube.sigs.k8s.io/docs/drivers/docker/"

func init() {
priority := registry.Default
// Staged rollout for preferred:
// - Linux
// - Windows (once "service" command works)
// - macOS
if runtime.GOOS == "linux" {
priority = registry.Preferred
}

if err := registry.Register(registry.DriverDef{
Name: driver.Docker,
Config: configure,
Init: func() drivers.Driver { return kic.NewDriver(kic.Config{OCIBinary: oci.Docker}) },
Status: status,
Priority: priority,
Priority: registry.HighlyPreferred,
}); err != nil {
panic(fmt.Sprintf("register failed: %v", err))
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/minikube/registry/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ const (
Default
// Preferred is for drivers that use a native hypervisor interface
Preferred
// HighlyPreferred is the ultimate driver preferences
HighlyPreferred
)

// Registry contains all the supported driver definitions on the host
Expand Down