From 9ba6c7cdcb0f1a310f721b73b52a891a84025098 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Wed, 10 Mar 2021 18:38:19 +0000 Subject: [PATCH] multinode cluster: fix waits and joins --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +- pkg/minikube/node/start.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index c4611990ac05..883136ab1d98 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -487,7 +487,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time } if cfg.VerifyComponents[kverify.NodeReadyKey] { - name := config.MachineName(cfg, n) + name := bsutil.KubeNodeName(cfg, n) if err := kverify.WaitNodeCondition(client, name, core.NodeReady, timeout); err != nil { return errors.Wrap(err, "waiting for node to be ready") } diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 058c086ef993..972b2d1ad75e 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -194,7 +194,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { return nil, errors.Wrap(err, "cni apply") } } - klog.Infof("Will wait %s for node %s", viper.GetDuration(waitTimeout), starter.Node) + klog.Infof("Will wait %s for node %+v", viper.GetDuration(waitTimeout), starter.Node) if err := bs.WaitForNode(*starter.Cfg, *starter.Node, viper.GetDuration(waitTimeout)); err != nil { return nil, errors.Wrapf(err, "wait %s for node", viper.GetDuration(waitTimeout)) }