Merge pull request #4545 from marcosdiez/dont_disable_container_engines_when_vmdriver_is_none

Don't disable other container engines when --vm_driver=none

Author: tstromberg

Diff for: cmd/minikube/cmd/start.go

@@ -751,7 +751,11 @@ func configureRuntimes(runner cruntime.CommandRunner) cruntime.Manager {
 		exit.WithError(fmt.Sprintf("Failed runtime for %+v", config), err)
 	}
 
-	err = cr.Enable()
+	disableOthers := true
+	if viper.GetString(vmDriver) == constants.DriverNone {
+		disableOthers = false
+	}
+	err = cr.Enable(disableOthers)
 	if err != nil {
 		exit.WithError("Failed to enable container runtime", err)
 	}

Diff for: pkg/minikube/cruntime/containerd.go

@@ -80,9 +80,11 @@ func (r *Containerd) Available() error {
 }
 
 // Enable idempotently enables containerd on a host
-func (r *Containerd) Enable() error {
-	if err := disableOthers(r, r.Runner); err != nil {
-		glog.Warningf("disableOthers: %v", err)
+func (r *Containerd) Enable(disOthers bool) error {
+	if disOthers {
+		if err := disableOthers(r, r.Runner); err != nil {
+			glog.Warningf("disableOthers: %v", err)
+		}
 	}
 	if err := populateCRIConfig(r.Runner, r.SocketPath()); err != nil {
 		return err

Diff for: pkg/minikube/cruntime/crio.go

@@ -78,9 +78,11 @@ func (r *CRIO) Active() bool {
 }
 
 // Enable idempotently enables CRIO on a host
-func (r *CRIO) Enable() error {
-	if err := disableOthers(r, r.Runner); err != nil {
-		glog.Warningf("disableOthers: %v", err)
+func (r *CRIO) Enable(disOthers bool) error {
+	if disOthers {
+		if err := disableOthers(r, r.Runner); err != nil {
+			glog.Warningf("disableOthers: %v", err)
+		}
 	}
 	if err := populateCRIConfig(r.Runner, r.SocketPath()); err != nil {
 		return err

Diff for: pkg/minikube/cruntime/cruntime.go

@@ -38,7 +38,7 @@ type Manager interface {
 	// Version retrieves the current version of this runtime
 	Version() (string, error)
 	// Enable idempotently enables this runtime on a host
-	Enable() error
+	Enable(bool) error
 	// Disable idempotently disables this runtime on a host
 	Disable() error
 	// Active returns whether or not a runtime is active on a host

Diff for: pkg/minikube/cruntime/cruntime_test.go

@@ -406,7 +406,7 @@ func TestEnable(t *testing.T) {
 			if err != nil {
 				t.Fatalf("New(%s): %v", tc.runtime, err)
 			}
-			err = cr.Enable()
+			err = cr.Enable(true)
 			if err != nil {
 				t.Errorf("%s disable unexpected error: %v", tc.runtime, err)
 			}

Diff for: pkg/minikube/cruntime/docker.go

@@ -78,9 +78,11 @@ func (r *Docker) Active() bool {
 }
 
 // Enable idempotently enables Docker on a host
-func (r *Docker) Enable() error {
-	if err := disableOthers(r, r.Runner); err != nil {
-		glog.Warningf("disableOthers: %v", err)
+func (r *Docker) Enable(disOthers bool) error {
+	if disOthers {
+		if err := disableOthers(r, r.Runner); err != nil {
+			glog.Warningf("disableOthers: %v", err)
+		}
 	}
 	return r.Runner.Run("sudo systemctl start docker")
 }