Merge branch 'master' of github.com:kubernetes/minikube into fix-download-test

pkg/minikube/bootstrapper/kubeadm/kubeadm.go

@@ -328,6 +328,7 @@ func (k *Bootstrapper) applyCNI(cfg config.ClusterConfig) error {
 		return nil
 	}
 
+	register.Reg.SetStep(register.ConfiguringCNI)
 	out.Step(style.CNI, "Configuring {{.name}} (Container Networking Interface) ...", out.V{"name": cnm.String()})
 
 	if err := cnm.Apply(k.c); err != nil {

pkg/minikube/out/register/register.go

@@ -41,6 +41,7 @@ const (
 	PreparingKubernetesCerts          RegStep = "Generating certificates"
 	PreparingKubernetesControlPlane   RegStep = "Booting control plane"
 	PreparingKubernetesBootstrapToken RegStep = "Configuring RBAC rules"
+	ConfiguringCNI                    RegStep = "Configuring CNI"
 	VerifyingKubernetes               RegStep = "Verifying Kubernetes"
 	EnablingAddons                    RegStep = "Enabling Addons"
 	Done                              RegStep = "Done"
@@ -85,6 +86,7 @@ func init() {
 				PreparingKubernetesCerts,
 				PreparingKubernetesControlPlane,
 				PreparingKubernetesBootstrapToken,
+				ConfiguringCNI,
 				ConfiguringLHEnv,
 				VerifyingKubernetes,
 				EnablingAddons,

test/integration/json_output_test.go

@@ -122,7 +122,7 @@ func validateIncreasingCurrentSteps(ctx context.Context, t *testing.T, ces []*cl
 	}
 }
 
-func TestJSONOutputError(t *testing.T) {
+func TestErrorJSONOutput(t *testing.T) {
 	profile := UniqueProfileName("json-output-error")
 	ctx, cancel := context.WithTimeout(context.Background(), Minutes(2))
 	defer Cleanup(t, profile, cancel)

test/integration/main_test.go

@@ -115,6 +115,11 @@ func HyperVDriver() bool {
 	return strings.Contains(*startArgs, "--driver=hyperv") || strings.Contains(*startArgs, "--vm-driver=hyperv")
 }
 
+// VirtualboxDriver returns whether or not this test is using the VirtualBox driver
+func VirtualboxDriver() bool {
+	return strings.Contains(*startArgs, "--driver=virtualbox") || strings.Contains(*startArgs, "--vm-driver=virtualbox")
+}
+
 // DockerDriver returns whether or not this test is using the docker or podman driver
 func DockerDriver() bool {
 	return strings.Contains(*startArgs, "--driver=docker") || strings.Contains(*startArgs, "--vm-driver=docker")

test/integration/start_stop_delete_test.go

@@ -51,7 +51,6 @@ func TestStartStop(t *testing.T) {
 				"--kvm-qemu-uri=qemu:///system",
 				"--disable-driver-mounts",
 				"--keep-context=false",
-				"--container-runtime=docker",
 			}},
 			{"newest-cni", constants.NewestKubernetesVersion, []string{
 				"--feature-gates",
@@ -60,14 +59,13 @@ func TestStartStop(t *testing.T) {
 				"--extra-config=kubelet.network-plugin=cni",
 				"--extra-config=kubeadm.pod-network-cidr=192.168.111.111/16",
 			}},
-			{"containerd", constants.DefaultKubernetesVersion, []string{
+			{"default-k8s-different-port", constants.DefaultKubernetesVersion, []string{
-				"--container-runtime=containerd",
-				"--docker-opt",
-				"containerd=/var/run/containerd/containerd.sock",
 				"--apiserver-port=8444",
 			}},
-			{"crio", "v1.15.7", []string{
+			{"no-preload", constants.NewestKubernetesVersion, []string{
-				"--container-runtime=crio",
+				"--preload=false",
+			}},
+			{"disable-driver-mounts", constants.DefaultKubernetesVersion, []string{
 				"--disable-driver-mounts",
 				"--extra-config=kubeadm.ignore-preflight-errors=SystemVerification",
 			}},
@@ -87,6 +85,9 @@ func TestStartStop(t *testing.T) {
 				if !strings.Contains(tc.name, "docker") && NoneDriver() {
 					t.Skipf("skipping %s - incompatible with none driver", t.Name())
 				}
+				if strings.Contains(tc.name, "disable_driver_mounts") && !VirtualboxDriver() {
+					t.Skipf("skipping %s - only runs on virtualbox", t.Name())
+				}
 
 				waitFlag := "--wait=true"
 				if strings.Contains(tc.name, "cni") { // wait=app_running is broken for CNI https://github.com/kubernetes/minikube/issues/7354