From 45c3219470299d0a77f56c0d31f169015df89814 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Wed, 21 Aug 2019 17:24:41 -0700 Subject: [PATCH] none reliability: --force does not work in v1.10, allow failed kubelet --- pkg/drivers/none/none.go | 4 ++-- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go index 18e48fcbbf..5731d22841 100644 --- a/pkg/drivers/none/none.go +++ b/pkg/drivers/none/none.go @@ -233,8 +233,8 @@ func stopKubelet(exec command.Runner) error { if errStatus != nil { glog.Errorf("temporary error: for %q : %v", cmdCheck, errStatus) } - if !strings.Contains(out.String(), "dead") { - return fmt.Errorf("expected to kubelet to be dead but it got : %q", out) + if !strings.Contains(out.String(), "dead") && !strings.Contains(out.String(), "failed") { + return fmt.Errorf("unexpected kubelet state: %q", out) } return nil } diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index a089e7c3fb..e061151022 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -456,7 +456,15 @@ func (k *Bootstrapper) waitForAPIServer(k8s config.KubernetesConfig) error { // DeleteCluster removes the components that were started earlier func (k *Bootstrapper) DeleteCluster(k8s config.KubernetesConfig) error { + version, err := parseKubernetesVersion(k8s.KubernetesVersion) + if err != nil { + return errors.Wrap(err, "parsing kubernetes version") + } + cmd := fmt.Sprintf("%s reset --force", invokeKubeadm(k8s.KubernetesVersion)) + if version.LT(semver.MustParse("1.11.0")) { + cmd = fmt.Sprintf("%s reset", invokeKubeadm(k8s.KubernetesVersion)) + } out, err := k.c.CombinedOutput(cmd) if err != nil { return errors.Wrapf(err, "kubeadm reset: %s\n%s\n", cmd, out)