github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix kubectl updateWithRetries to have 1 minute timeout instead of 500 ms

Browse Source 
Fixes #12258
This commit is contained in:
Alex Mohr
2015-08-05 01:18:17 -07:00
parent 9610b8fe05
commit 37418afe8f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/rolling_updater.go
View File

@@ -312,10 +312,9 @@ type updateFunc func(controller *api.ReplicationController)
// updateWithRetries updates applies the given rc as an update. // updateWithRetries updates applies the given rc as an update.
func updateWithRetries(rcClient client.ReplicationControllerInterface, rc *api.ReplicationController, applyUpdate updateFunc) (*api.ReplicationController, error) { func updateWithRetries(rcClient client.ReplicationControllerInterface, rc *api.ReplicationController, applyUpdate updateFunc) (*api.ReplicationController, error) {
// Each update could take ~100ms, so give it 0.5 second
var err error var err error
oldRc := rc oldRc := rc
err = wait.Poll(10*time.Millisecond, 500*time.Millisecond, func() (bool, error) { err = wait.Poll(10*time.Millisecond, 1*time.Minute, func() (bool, error) {
// Apply the update, then attempt to push it to the apiserver. // Apply the update, then attempt to push it to the apiserver.
applyUpdate(rc) applyUpdate(rc)
if rc, err = rcClient.Update(rc); err == nil { if rc, err = rcClient.Update(rc); err == nil {