From d18978450c0ad83c16c6101b2c25fbd6b13d63d7 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 8 Aug 2019 17:12:33 -0700 Subject: [PATCH 1/2] Restore --disable-driver-mounts flag --- cmd/minikube/cmd/start.go | 1 + test/integration/start_stop_delete_test.go | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 6adab8760493..5e67e01675b1 100644 --- a/cmd/minikube/cmd/start.go +++ b/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)") diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index 2d13a17069f3..f90dee786ac2 100644 --- a/test/integration/start_stop_delete_test.go +++ b/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,14 +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", + "--disable-driver-mounts", "kubeadm.ignore-preflight-errors=SystemVerification", }}, } From 32c405d44da37c2a34fc3e33a9ece9b0f3beecf5 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Fri, 9 Aug 2019 06:35:39 -0700 Subject: [PATCH 2/2] Fix way flags are being passed into crio test --- test/integration/start_stop_delete_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index f90dee786ac2..cb2199981c7c 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -67,9 +67,8 @@ func TestStartStop(t *testing.T) { }}, {"crio", []string{ "--container-runtime=crio", - "--extra-config", "--disable-driver-mounts", - "kubeadm.ignore-preflight-errors=SystemVerification", + "--extra-config=kubeadm.ignore-preflight-errors=SystemVerification", }}, }