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

add time out for wait for default sa

pull/7375/head
Medya Gh 2020-04-02 19:18:06 -07:00
parent 62ca22a662
commit 5f6b547a1d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/minikube/bootstrapper/bsutil/kverify/default_sa.go
View File

@ -29,10 +29,14 @@ import (
)
// WaitForDefaultSA waits for the default service account to be created.
func WaitForDefaultSA(cs *kubernetes.Clientset) error {
func WaitForDefaultSA(cs *kubernetes.Clientset, timeout time.Duration) error {
glog.Info("waiting for default service account to be created ...")
pStart := time.Now()
start := time.Now()
saReady := func() error {
if time.Since(start) > timeout {
glog.Error("exceeded max time to wait to verify cluster during waiting for default service account. will skip waiting.")
return nil
}
// equivalent to manual check of 'kubectl --context profile get serviceaccount default'
sas, err := cs.CoreV1().ServiceAccounts("default").List(meta.ListOptions{})
if err != nil {

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

@ -350,7 +350,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
cr, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c})
if err != nil {
return err
return errors.Wrapf(err, "create runtme-manager %s", cfg.KubernetesConfig.ContainerRuntime)
}
hostname, _, port, err := driver.ControlPaneEndpoint(&cfg, &n, cfg.Driver)
@ -387,8 +387,8 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
if err != nil {
return errors.Wrap(err, "get k8s client")
}
if err := kverify.WaitForSystemPods(cr, k, cfg, k.c, client, start, timeout); err != nil {
return errors.Wrap(err, "waiting for system pods")
if err := kverify.WaitForDefaultSA(client, timeout); err != nil {
return errors.Wrap(err, "waiting for default service account")
}
}
glog.Infof("duration metric: took %s to wait for : %+v ...", time.Since(start), cfg.WaitForCompos)