fix none driver

kubernetes · spowelljr · Jan 19, 2023 · Dec 5, 2022 · Dec 5, 2022 · Dec 5, 2022
commit e2f2bc923a4c1a10fb95148f79352e0aa0d7f198
diff --git a/pkg/minikube/cni/cni.go b/pkg/minikube/cni/cni.go
@@ -138,11 +138,6 @@ func chooseDefault(cc config.ClusterConfig) Manager {
 		return Bridge{}
 	}
 
-	if driver.BareMetal(cc.Driver) {
-		klog.Infof("Driver %s used, CNI unnecessary in this configuration, recommending no CNI", cc.Driver)
-		return Disabled{cc: cc}
-	}
-
 	if len(cc.Nodes) > 1 || cc.MultiNodeRequested {
 		// Enables KindNet CNI in master in multi node cluster, This solves the network problem
 		// inside pod for multi node clusters. See https://github.com/kubernetes/minikube/issues/9838.

diff --git a/pkg/minikube/cruntime/cruntime.go b/pkg/minikube/cruntime/cruntime.go
@@ -345,11 +345,7 @@ func ConfigureNetworkPlugin(r Manager, cr CommandRunner, networkPlugin string) e
 		}
 		return nil
 	}
-	dm, ok := r.(*Docker)
-	if !ok {
-		return fmt.Errorf("name and type mismatch")
-	}
-	return dockerConfigureNetworkPlugin(*dm, cr, networkPlugin)
+	return dockerConfigureNetworkPlugin(cr, networkPlugin)
 }
 
 // updateCRIDockerdBinary updates cri-dockerd to version

diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go
@@ -699,7 +699,7 @@ const (
 	CNICacheDir = "/var/lib/cni/cache"
 )
 
-func dockerConfigureNetworkPlugin(r Docker, cr CommandRunner, networkPlugin string) error {
+func dockerConfigureNetworkPlugin(cr CommandRunner, networkPlugin string) error {
 	// $ cri-dockerd --version
 	// cri-dockerd 0.2.6 (d8accf7)
 	// $ cri-dockerd --help | grep -i cni
@@ -738,5 +738,5 @@ ExecStart=/usr/bin/cri-dockerd --container-runtime-endpoint fd:// --network-plug
 	if err := cr.Copy(svc); err != nil {
 		return errors.Wrap(err, "failed to copy template")
 	}
-	return r.Init.Restart("cri-docker")
+	return nil
 }
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
@@ -417,9 +417,9 @@ func configureRuntimes(runner cruntime.CommandRunner, cc config.ClusterConfig, k
 	inUserNamespace := strings.Contains(cc.KubernetesConfig.FeatureGates, "KubeletInUserNamespace=true")
 	// for docker container runtime: ensure containerd is properly configured by calling Enable(), as docker could be bound to containerd
 	// it will also "soft" start containerd, but it will not disable others; docker will disable containerd if not used in the next step
-	if co.Type == "docker" {
+	if co.Type == constants.Docker {
 		containerd, err := cruntime.New(cruntime.Config{
-			Type:              "containerd",
+			Type:              constants.Containerd,
 			Socket:            "", // use default
 			Runner:            co.Runner,
 			ImageRepository:   co.ImageRepository,
@@ -434,20 +434,17 @@ func configureRuntimes(runner cruntime.CommandRunner, cc config.ClusterConfig, k
 	}
 
 	disableOthers := !driver.BareMetal(cc.Driver)
-	err = cr.Enable(disableOthers, cgroupDriver(cc), inUserNamespace)
-	if err != nil {
+	if err = cr.Enable(disableOthers, cgroupDriver(cc), inUserNamespace); err != nil {
 		exit.Error(reason.RuntimeEnable, "Failed to enable container runtime", err)
 	}
 
 	// Wait for the CRI to be "live", before returning it
-	err = waitForCRISocket(runner, cr.SocketPath(), 60, 1)
-	if err != nil {
+	if err = waitForCRISocket(runner, cr.SocketPath(), 60, 1); err != nil {
 		exit.Error(reason.RuntimeEnable, "Failed to start container runtime", err)
 	}
 
 	// Wait for the CRI to actually work, before returning
-	err = waitForCRIVersion(runner, cr.SocketPath(), 60, 10)
-	if err != nil {
+	if err = waitForCRIVersion(runner, cr.SocketPath(), 60, 10); err != nil {
 		exit.Error(reason.RuntimeEnable, "Failed to start container runtime", err)
 	}