Merge pull request #5026 from tstromberg/drvmnt

Restore --disable-driver-mounts flag

cmd/minikube/cmd/start.go

@@ -169,6 +169,7 @@ func initKubernetesFlags() {
 // initDriverFlags inits the commandline flags for vm drivers
 func initDriverFlags() {
 	startCmd.Flags().String(vmDriver, constants.DefaultVMDriver, fmt.Sprintf("VM driver is one of: %v", constants.SupportedVMDrivers))
+	startCmd.Flags().Bool(disableDriverMounts, false, "Disables the filesystem mounts provided by the hypervisors")
 
 	// kvm2
 	startCmd.Flags().String(kvmNetwork, "default", "The KVM network name. (only supported with KVM driver)")

test/integration/start_stop_delete_test.go

@@ -44,7 +44,7 @@ func TestStartStop(t *testing.T) {
 			name string
 			args []string
 		}{
-			{"oldest", []string{ // nocache_oldest
+			{"oldest", []string{
 				"--cache-images=false",
 				fmt.Sprintf("--kubernetes-version=%s", constants.OldestKubernetesVersion),
 				// default is the network created by libvirt, if we change the name minikube won't boot
@@ -52,7 +52,7 @@ func TestStartStop(t *testing.T) {
 				"--kvm-network=default",
 				"--kvm-qemu-uri=qemu:///system",
 			}},
-			{"cni", []string{ // feature_gates_newest_cni
+			{"cni", []string{
 				"--feature-gates",
 				"ServerSideApply=true",
 				"--network-plugin=cni",
@@ -60,15 +60,15 @@ func TestStartStop(t *testing.T) {
 				"--extra-config=kubeadm.pod-network-cidr=192.168.111.111/16",
 				fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion),
 			}},
-			{"containerd", []string{ // containerd_and_non_default_apiserver_port
+			{"containerd", []string{
 				"--container-runtime=containerd",
 				"--docker-opt containerd=/var/run/containerd/containerd.sock",
 				"--apiserver-port=8444",
 			}},
-			{"crio", []string{ // crio_ignore_preflights
+			{"crio", []string{
 				"--container-runtime=crio",
-				"--extra-config",
-				"kubeadm.ignore-preflight-errors=SystemVerification",
+				"--disable-driver-mounts",
+				"--extra-config=kubeadm.ignore-preflight-errors=SystemVerification",
 			}},
 		}