Merge pull request #7700 from sharifelgamal/multi-vm

Fix multinode cluster creation for VM drivers

pkg/minikube/node/start.go

@@ -156,9 +156,23 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 			return nil, errors.Wrap(err, "Updating node")
 		}
 
-		cpBs, err := cluster.Bootstrapper(starter.MachineAPI, viper.GetString(cmdcfg.Bootstrapper), *starter.Cfg, starter.Runner)
+		// Make sure to use the command runner for the control plane to generate the join token
+		cp, err := config.PrimaryControlPlane(starter.Cfg)
 		if err != nil {
-			return nil, errors.Wrap(err, "Getting bootstrapper")
+			return nil, errors.Wrap(err, "getting primary control plane")
+		}
+		h, err := machine.LoadHost(starter.MachineAPI, driver.MachineName(*starter.Cfg, cp))
+		if err != nil {
+			return nil, errors.Wrap(err, "getting control plane host")
+		}
+		cpr, err := machine.CommandRunner(h)
+		if err != nil {
+			return nil, errors.Wrap(err, "getting control plane command runner")
+		}
+
+		cpBs, err := cluster.Bootstrapper(starter.MachineAPI, viper.GetString(cmdcfg.Bootstrapper), *starter.Cfg, cpr)
+		if err != nil {
+			return nil, errors.Wrap(err, "getting control plane bootstrapper")
 		}
 
 		joinCmd, err := cpBs.GenerateToken(*starter.Cfg)

test/integration/multinode_test.go

+// +build integration
+
+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package integration
+
+import (
+	"context"
+	"os/exec"
+	"strings"
+	"testing"
+)
+
+func TestMultiNode(t *testing.T) {
+	if NoneDriver() {
+		t.Skip("none driver does not support multinode")
+	}
+
+	// TODO: remove this skip once docker multinode is fixed
+	if KicDriver() {
+		t.Skip("docker driver multinode is currently broken :(")
+	}
+
+	profile := UniqueProfileName("multinode")
+	ctx, cancel := context.WithTimeout(context.Background(), Minutes(30))
+	defer CleanupWithLogs(t, profile, cancel)
+
+	startArgs := append([]string{"start", "-p", profile, "--wait=true"}, StartArgs()...)
+	rr, err := Run(t, exec.CommandContext(ctx, Target(), startArgs...))
+	if err != nil {
+		t.Fatalf("failed to start cluster. args %q : %v", rr.Command(), err)
+	}
+
+	// Add a node to the current cluster
+	addArgs := []string{"node", "add", "-p", profile, "-v", "3", "--alsologtostderr"}
+	rr, err = Run(t, exec.CommandContext(ctx, Target(), addArgs...))
+	if err != nil {
+		t.Fatalf("failed to add node to current cluster. args %q : %v", rr.Command(), err)
+	}
+
+	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status"))
+	if err != nil {
+		t.Fatalf("failed to run minikube status. args %q : %v", rr.Command(), err)
+	}
+
+	if strings.Count(rr.Stdout.String(), "host: Running") != 2 {
+		t.Errorf("status says both hosts are not running: args %q: %v", rr.Command(), rr.Stdout.String())
+	}
+
+	if strings.Count(rr.Stdout.String(), "kubelet: Running") != 2 {
+		t.Errorf("status says both kubelets are not running: args %q: %v", rr.Command(), rr.Stdout.String())
+	}
+
+}

test/integration/util.go

@@ -56,6 +56,6 @@ func UniqueProfileName(prefix string) string {
 	if NoneDriver() {
 		return "minikube"
 	}
-	// example: prefix-20200413T162239-3215
-	return fmt.Sprintf("%s-%s-%d", prefix, time.Now().Format("20060102T150405"), os.Getpid())
+	// example: prefix-20200413162239-3215
+	return fmt.Sprintf("%s-%s-%d", prefix, time.Now().Format("20060102150405"), os.Getpid())
 }