diff --git a/cmd/minikube/cmd/config/open.go b/cmd/minikube/cmd/config/open.go index b49dce72fe7925c1f9ed2d2ffd9b7b66cc70f2ab..3a5e10c755c73856a84c3df6fb53a51be4589869 100644 --- a/cmd/minikube/cmd/config/open.go +++ b/cmd/minikube/cmd/config/open.go @@ -88,7 +88,6 @@ You can add one by annotating a service with the label {{.labelName}}:{{.addonNa for i := range serviceList.Items { svc := serviceList.Items[i].ObjectMeta.Name var urlString []string - if urlString, err = service.WaitForService(co.API, namespace, svc, addonsURLTemplate, addonsURLMode, https, wait, interval); err != nil { exit.WithCodeT(exit.Unavailable, "Wait failed: {{.error}}", out.V{"error": err}) } diff --git a/cmd/minikube/cmd/dashboard.go b/cmd/minikube/cmd/dashboard.go index 51957e4b5889faacd78cbb91ad952bf08aa64c11..cba6f43c227106f7636793ed2bdfbc88e90ad8c2 100644 --- a/cmd/minikube/cmd/dashboard.go +++ b/cmd/minikube/cmd/dashboard.go @@ -84,7 +84,8 @@ var dashboardCmd = &cobra.Command{ svc := "kubernetes-dashboard" out.ErrT(out.Verifying, "Verifying dashboard health ...") checkSVC := func() error { return service.CheckService(ns, svc) } - if err = retry.Expo(checkSVC, 1*time.Second, time.Minute*5); err != nil { + // for slow machines or parallels in CI to avoid #7503 + if err = retry.Expo(checkSVC, 100*time.Microsecond, time.Minute*10); err != nil { exit.WithCodeT(exit.Unavailable, "dashboard service is not running: {{.error}}", out.V{"error": err}) } @@ -97,7 +98,7 @@ var dashboardCmd = &cobra.Command{ out.ErrT(out.Verifying, "Verifying proxy health ...") chkURL := func() error { return checkURL(url) } - if err = retry.Expo(chkURL, 1*time.Second, 3*time.Minute); err != nil { + if err = retry.Expo(chkURL, 100*time.Microsecond, 10*time.Minute); err != nil { exit.WithCodeT(exit.Unavailable, "{{.url}} is not accessible: {{.error}}", out.V{"url": url, "error": err}) } diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index b39ee3f60174277a2d7b2f917c19a51acbe9799f..3b5666e9ddbce2b8e5e8f94eacd4a1689bd91a87 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -244,7 +244,7 @@ func enableOrDisableAddonInternal(cc *config.ClusterConfig, addon *assets.Addon, return err } - return retry.Expo(apply, 1*time.Second, time.Second*30) + return retry.Expo(apply, 100*time.Microsecond, time.Minute) } // enableOrDisableStorageClasses enables or disables storage classes diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 3ae20295e46768848af09e219927074d3bed9a07..c91f4b6f7c103ba15ebdb567f0aa0ed5bf014ad2 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -522,7 +522,7 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error { _, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("%s phase addon all --config %s", baseCmd, conf))) return err } - if err = retry.Expo(addonPhase, 1*time.Second, 30*time.Second); err != nil { + if err = retry.Expo(addonPhase, 100*time.Microsecond, 30*time.Second); err != nil { glog.Warningf("addon install failed, wil retry: %v", err) return errors.Wrap(err, "addons") } diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go index 2f630f9332499fd384c9e7eb1e629e23be0e917c..50fb6a28ae985d98af08b36e6f2f7cf74c80d5e7 100644 --- a/pkg/provision/buildroot.go +++ b/pkg/provision/buildroot.go @@ -177,7 +177,7 @@ func (p *BuildrootProvisioner) Provision(swarmOptions swarm.Options, authOptions return nil } - err := retry.Expo(configAuth, time.Second, 2*time.Minute) + err := retry.Expo(configAuth, 100*time.Microsecond, 2*time.Minute) if err != nil { glog.Infof("Error configuring auth during provisioning %v", err) return err diff --git a/pkg/provision/ubuntu.go b/pkg/provision/ubuntu.go index 3fbf006b69f7654b05214f7e191a2bb9fd1790ed..29349cd66c08fe5c4e44401cd83266edbb3327f4 100644 --- a/pkg/provision/ubuntu.go +++ b/pkg/provision/ubuntu.go @@ -180,7 +180,7 @@ func (p *UbuntuProvisioner) Provision(swarmOptions swarm.Options, authOptions au return nil } - err := retry.Expo(configAuth, time.Second, 2*time.Minute) + err := retry.Expo(configAuth, 100*time.Microsecond, 2*time.Minute) if err != nil { glog.Infof("Error configuring auth during provisioning %v", err)