github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-12-03 21:04:47 +00:00
Code Issues Projects Releases Wiki Activity

resize: Use Resize method

Browse Source
This commit is contained in:
kargakis
2015-05-11 17:31:08 +02:00
parent 2e3c40b5c2
commit 69a96f3ea1
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubectl/resize.go
View File

@@ -102,7 +102,7 @@ type ReplicationControllerResizer struct {
}
type RetryParams struct {
interval, timeout time.Duration
Interval, Timeout time.Duration
}
// ResizeCondition is a closure around Resize that facilitates retries via util.wait
@@ -149,18 +149,16 @@ func (resizer *ReplicationControllerResizer) Resize(namespace, name string, newS
}
if retry == nil {
// Make it try only once, immediately
retry = &RetryParams{interval: time.Millisecond, timeout: time.Millisecond}
retry = &RetryParams{Interval: time.Millisecond, Timeout: time.Millisecond}
}
cond := ResizeCondition(resizer, preconditions, namespace, name, newSize)
if err := wait.Poll(retry.interval, retry.timeout, cond); err != nil {
if err := wait.Poll(retry.Interval, retry.Timeout, cond); err != nil {
return err
}
if waitForReplicas != nil {
rc := &api.ReplicationController{ObjectMeta: api.ObjectMeta{Namespace: namespace, Name: name}}
if err := wait.Poll(waitForReplicas.interval, waitForReplicas.timeout,
resizer.c.ControllerHasDesiredReplicas(rc)); err != nil {
return err
}
return wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout,
resizer.c.ControllerHasDesiredReplicas(rc))
}
return nil
}