From 698f176d318f48960fd1a88a31cfce6839305609 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 16 May 2019 13:41:59 -0700 Subject: [PATCH] Remove unused validateCluster, now handled by bootstrapper.WaitCluster --- cmd/minikube/cmd/start.go | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 8d57da1ba..d2e189c60 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -32,7 +32,6 @@ import ( "github.com/blang/semver" "github.com/docker/machine/libmachine" "github.com/docker/machine/libmachine/host" - "github.com/docker/machine/libmachine/state" "github.com/golang/glog" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" @@ -669,34 +668,6 @@ func bootstrapCluster(bs bootstrapper.Bootstrapper, r cruntime.Manager, runner b } } -// validateCluster validates that the cluster is well-configured and healthy -func validateCluster(bs bootstrapper.Bootstrapper, r cruntime.Manager, runner bootstrapper.CommandRunner, ip string, apiserverPort int) { - k8sStat := func() (err error) { - st, err := bs.GetKubeletStatus() - if err != nil || st != state.Running.String() { - return &pkgutil.RetriableError{Err: fmt.Errorf("kubelet unhealthy: %v: %s", err, st)} - } - return nil - } - err := pkgutil.RetryAfter(20, k8sStat, 3*time.Second) - if err != nil { - exit.WithLogEntries("kubelet checks failed", err, logs.FindProblems(r, bs, runner)) - } - aStat := func() (err error) { - st, err := bs.GetAPIServerStatus(net.ParseIP(ip), apiserverPort) - if err != nil || st != state.Running.String() { - return &pkgutil.RetriableError{Err: fmt.Errorf("apiserver status=%s err=%v", st, err)} - } - return nil - } - - err = pkgutil.RetryAfter(30, aStat, 10*time.Second) - if err != nil { - exit.WithLogEntries("apiserver checks failed", err, logs.FindProblems(r, bs, runner)) - } - console.OutLn("") -} - // configureMounts configures any requested filesystem mounts func configureMounts() { if !viper.GetBool(createMount) { -- GitLab