kubectl: ignore deleted pods in the rolling updater

This commit is contained in:
Michail Kargakis
2016-12-22 14:26:17 +01:00
parent f9707a7d9b
commit 3ee150fcc0
2 changed files with 34 additions and 2 deletions

View File

@@ -425,6 +425,10 @@ func (r *RollingUpdater) readyPods(oldRc, newRc *api.ReplicationController, minR
if err := v1.Convert_api_Pod_To_v1_Pod(&pod, v1Pod, nil); err != nil {
return 0, 0, err
}
// Do not count deleted pods as ready
if v1Pod.DeletionTimestamp != nil {
continue
}
if !deploymentutil.IsPodAvailable(v1Pod, minReadySeconds, r.nowFn().Time) {
continue
}