Merge pull request #9476 from sharifelgamal/restart-worker

make sure worker nodes actually join control plane on restart
kubernetes · Oct 16, 2020 · a282354 · a282354
2 parents f758fb0 + 14003b0
commit a282354
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -673,18 +673,17 @@ func (k *Bootstrapper) JoinCluster(cc config.ClusterConfig, n config.Node, joinC
 			klog.Infof("kubeadm reset failed, continuing anyway: %v", err)
 		}
 
-		out, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", joinCmd))
+		_, err = k.c.RunCmd(exec.Command("/bin/bash", "-c", joinCmd))
 		if err != nil {
 			if strings.Contains(err.Error(), "status \"Ready\" already exists in the cluster") {
-				klog.Infof("Node %s already joined the cluster, skip failure.", n.Name)
-			} else {
-				return errors.Wrapf(err, "cmd failed: %s\n%+v\n", joinCmd, out.Output())
+				klog.Info("still waiting for the worker node to register with the api server")
 			}
+			return errors.Wrapf(err, "kubeadm join")
 		}
 		return nil
 	}
 
-	if err := retry.Expo(join, 10*time.Second, 1*time.Minute); err != nil {
+	if err := retry.Expo(join, 10*time.Second, 3*time.Minute); err != nil {
 		return errors.Wrap(err, "joining cp")
 	}
 

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
@@ -133,6 +133,9 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 			return nil, errors.Wrap(err, "setting up certs")
 		}
 
+		if err := bs.UpdateNode(*starter.Cfg, *starter.Node, cr); err != nil {
+			return nil, errors.Wrap(err, "update node")
+		}
 	}
 
 	var wg sync.WaitGroup
@@ -167,10 +170,6 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 			prepareNone()
 		}
 	} else {
-		if err := bs.UpdateNode(*starter.Cfg, *starter.Node, cr); err != nil {
-			return nil, errors.Wrap(err, "update node")
-		}
-
 		// Make sure to use the command runner for the control plane to generate the join token
 		cpBs, cpr, err := cluster.ControlPlaneBootstrapper(starter.MachineAPI, starter.Cfg, viper.GetString(cmdcfg.Bootstrapper))
 		if err != nil {

diff --git a/test/integration/multinode_test.go b/test/integration/multinode_test.go
@@ -24,7 +24,6 @@ import (
 	"os/exec"
 	"strings"
 	"testing"
-	"time"
 )
 
 func TestMultiNode(t *testing.T) {
@@ -228,8 +227,6 @@ func validateRestartMultiNodeCluster(ctx context.Context, t *testing.T, profile
 		t.Fatalf("failed to start cluster. args %q : %v", rr.Command(), err)
 	}
 
-	time.Sleep(Seconds(45))
-
 	// Make sure minikube status shows 2 running nodes
 	rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status", "--alsologtostderr"))
 	if err != nil {