From 37418afe8fbce36a426e07221fa8f6dfac3f73b2 Mon Sep 17 00:00:00 2001
From: Alex Mohr <mohr@google.com>
Date: Wed, 5 Aug 2015 01:18:17 -0700
Subject: [PATCH] Fix kubectl updateWithRetries to have 1 minute timeout
 instead of 500 ms

Fixes #12258
---
 pkg/kubectl/rolling_updater.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go
index c8ced0c2c62..880299ff21f 100644
--- a/pkg/kubectl/rolling_updater.go
+++ b/pkg/kubectl/rolling_updater.go
@@ -312,10 +312,9 @@ type updateFunc func(controller *api.ReplicationController)
 
 // updateWithRetries updates applies the given rc as an update.
 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
 	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.
 		applyUpdate(rc)
 		if rc, err = rcClient.Update(rc); err == nil {