From 2cc7445f1c9b125252eecaa4b5c7f560caf9da6d Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 28 Jul 2020 12:16:33 -0700 Subject: [PATCH] guard against joining the cluster twice --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 9f20e61285..1fe2aa63eb 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -654,7 +654,11 @@ func (k *Bootstrapper) JoinCluster(cc config.ClusterConfig, n config.Node, joinC out, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", joinCmd)) if err != nil { - return errors.Wrapf(err, "cmd failed: %s\n%+v\n", joinCmd, out.Output()) + if strings.Contains(err.Error(), "status \"Ready\" already exists in the cluster") { + glog.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()) + } } return nil }