Merge pull request #10232 from priyawadhwa/fix-json-output

Add JSON step for CNI to fix failing TestJSONOutput 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)