kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

adjust try

pull/7726/head
Medya Gh 2020-04-16 15:14:59 -07:00
parent 0d6713a875
commit bb327e250d
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/minikube/cmd/config/open.go
View File

@ -88,7 +88,6 @@ You can add one by annotating a service with the label {{.labelName}}:{{.addonNa
for i := range serviceList.Items { for i := range serviceList.Items {
svc := serviceList.Items[i].ObjectMeta.Name svc := serviceList.Items[i].ObjectMeta.Name
var urlString []string var urlString []string
if urlString, err = service.WaitForService(co.API, namespace, svc, addonsURLTemplate, addonsURLMode, https, wait, interval); err != nil { 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}) exit.WithCodeT(exit.Unavailable, "Wait failed: {{.error}}", out.V{"error": err})
} }

5
cmd/minikube/cmd/dashboard.go
View File

@ -84,7 +84,8 @@ var dashboardCmd = &cobra.Command{
svc := "kubernetes-dashboard" svc := "kubernetes-dashboard"
out.ErrT(out.Verifying, "Verifying dashboard health ...") out.ErrT(out.Verifying, "Verifying dashboard health ...")
checkSVC := func() error { return service.CheckService(ns, svc) } 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}) 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 ...") out.ErrT(out.Verifying, "Verifying proxy health ...")
chkURL := func() error { return checkURL(url) } 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}) exit.WithCodeT(exit.Unavailable, "{{.url}} is not accessible: {{.error}}", out.V{"url": url, "error": err})
} }

2
pkg/addons/addons.go
View File

@ -244,7 +244,7 @@ func enableOrDisableAddonInternal(cc *config.ClusterConfig, addon *assets.Addon,
return err 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 // enableOrDisableStorageClasses enables or disables storage classes

2
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
View File

@ -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))) _, err := k.c.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("%s phase addon all --config %s", baseCmd, conf)))
return err 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) glog.Warningf("addon install failed, wil retry: %v", err)
return errors.Wrap(err, "addons") return errors.Wrap(err, "addons")
} }

2
pkg/provision/buildroot.go
View File

@ -177,7 +177,7 @@ func (p *BuildrootProvisioner) Provision(swarmOptions swarm.Options, authOptions
return nil return nil
} }
err := retry.Expo(configAuth, time.Second, 2*time.Minute) err := retry.Expo(configAuth, 100*time.Microsecond, 2*time.Minute)
if err != nil { if err != nil {
glog.Infof("Error configuring auth during provisioning %v", err) glog.Infof("Error configuring auth during provisioning %v", err)
return err return err

2
pkg/provision/ubuntu.go
View File

@ -180,7 +180,7 @@ func (p *UbuntuProvisioner) Provision(swarmOptions swarm.Options, authOptions au
return nil return nil
} }
err := retry.Expo(configAuth, time.Second, 2*time.Minute) err := retry.Expo(configAuth, 100*time.Microsecond, 2*time.Minute)
if err != nil { if err != nil {
glog.Infof("Error configuring auth during provisioning %v", err) glog.Infof("Error configuring auth during provisioning %v", err)