Merge branch 'create-node' of github.com:sharifelgamal/minikube into create-node

pull/8095/head
Sharif Elgamal 2020-05-15 15:25:20 -07:00
commit c1c1d15b96
2 changed files with 5 additions and 1 deletions

View File

@ -888,10 +888,12 @@ func createNode(cc config.ClusterConfig, kubeNodeName string, existing *config.C
// Make sure that existing nodes honor if KubernetesVersion gets specified on restart
// KubernetesVersion is the only attribute that the user can override in the Node object
nodes := []config.Node{}
for _, n := range existing.Nodes {
n.KubernetesVersion = getKubernetesVersion(&cc)
cc.Nodes = append(cc.Nodes, n)
nodes = append(nodes, n)
}
cc.Nodes = nodes
return cc, cp, nil
}

View File

@ -327,6 +327,7 @@ func validateStatusCmd(ctx context.Context, t *testing.T, profile string) {
// Custom format
rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status", "-f", "host:{{.Host}},kublet:{{.Kubelet}},apiserver:{{.APIServer}},kubeconfig:{{.Kubeconfig}}"))
t.Logf("CUSTOM: %s\n", rr.Stdout.String())
if err != nil {
t.Errorf("failed to run minikube status with custom format: args %q: %v", rr.Command(te), err)
}
@ -338,6 +339,7 @@ func validateStatusCmd(ctx context.Context, t *testing.T, profile string) {
// Json output
rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status", "-o", "json"))
t.Logf("JSON: %s\n", rr.Stdout.String())
if err != nil {
t.Errorf("failed to run minikube status with json output. args %q : %v", rr.Command(), err)
}