github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 15:05:20 +00:00
Code Issues Projects Releases Wiki Activity

Reaper and scaler for jobs

Browse Source
This commit is contained in:
Maciej Szulik
2015-09-16 17:32:59 +02:00
parent 28585bc699
commit 48775319d9
9 changed files with 473 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/rolling_updater.go
View File

@@ -340,8 +340,7 @@ func (r *RollingUpdater) scaleDown(newRc, oldRc *api.ReplicationController, desi
// scalerScaleAndWait scales a controller using a Scaler and a real client.
func (r *RollingUpdater) scaleAndWaitWithScaler(rc *api.ReplicationController, retry *RetryParams, wait *RetryParams) (*api.ReplicationController, error) {
scalerClient := NewScalerClient(r.c)
scaler, err := ScalerFor("ReplicationController", scalerClient)
scaler, err := ScalerFor("ReplicationController", r.c)
if err != nil {
return nil, fmt.Errorf("Couldn't make scaler: %s", err)
}
@@ -452,8 +451,7 @@ func (r *RollingUpdater) cleanupWithClients(oldRc, newRc *api.ReplicationControl
if err != nil {
return err
}
scalerClient := NewScalerClient(r.c)
if err = wait.Poll(config.Interval, config.Timeout, scalerClient.ControllerHasDesiredReplicas(newRc)); err != nil {
if err = wait.Poll(config.Interval, config.Timeout, client.ControllerHasDesiredReplicas(r.c, newRc)); err != nil {
return err
}
newRc, err = r.c.ReplicationControllers(r.ns).Get(newRc.Name)