Merge pull request #11807 from mwielgus/scale_rc_fix

Add scale retry in ScaleRC in test/e2e/util.go
pull/6/head
Mike Danese 2015-07-24 15:25:48 -07:00
commit 6ca0151ff1
1 changed files with 2 additions and 1 deletions

View File

@ -1244,8 +1244,9 @@ func ScaleRC(c *client.Client, ns, name string, size uint) error {
if err != nil {
return err
}
waitForScale := kubectl.NewRetryParams(5*time.Second, 1*time.Minute)
waitForReplicas := kubectl.NewRetryParams(5*time.Second, 5*time.Minute)
if err = scaler.Scale(ns, name, size, nil, nil, waitForReplicas); err != nil {
if err = scaler.Scale(ns, name, size, nil, waitForScale, waitForReplicas); err != nil {
return err
}
return waitForRCPodsRunning(c, ns, name)