wait for 10s before controller manager fails when api-server is not up

This commit is contained in:
He Simei 2015-11-11 20:28:25 +08:00
parent 0dac3e12c5
commit d76d57e0e1

View File

@ -314,8 +314,11 @@ func (s *CMServer) Run(_ []string) error {
// important when we start apiserver and controller manager at the same time. // important when we start apiserver and controller manager at the same time.
var versionStrings []string var versionStrings []string
err = wait.PollImmediate(time.Second, 10*time.Second, func() (bool, error) { err = wait.PollImmediate(time.Second, 10*time.Second, func() (bool, error) {
versionStrings, err = client.ServerAPIVersions(kubeconfig) if versionStrings, err = client.ServerAPIVersions(kubeconfig); err == nil {
return err == nil, err return true, nil
}
glog.Errorf("Failed to get api versions from server: %v", err)
return false, nil
}) })
if err != nil { if err != nil {
glog.Fatalf("Failed to get api versions from server: %v", err) glog.Fatalf("Failed to get api versions from server: %v", err)