kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Add JSON step for CNI to fix failing TestJSONOutput test
pull/10219/head^2
priyawadhwa 2021-01-25 13:42:44 -08:00 committed by GitHub
parent 6e5a36f17a a9f435b757
commit a4ee1e0791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
View File

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

2
pkg/minikube/out/register/register.go
View File

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

2
test/integration/json_output_test.go
View File

@ -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") profile := UniqueProfileName("json-output-error")
ctx, cancel := context.WithTimeout(context.Background(), Minutes(2)) ctx, cancel := context.WithTimeout(context.Background(), Minutes(2))
defer Cleanup(t, profile, cancel) defer Cleanup(t, profile, cancel)