Merge pull request #31763 from fraenkel/drain_finished

Automatic merge from submit-queue Finished pods can be drained fixes #26080 ```release-note Kubectl drain will now drain finished Pods ```

Merge pull request #31763 from fraenkel/drain_finished
563919c3 · Kubernetes Submit Queue · GitHub · a824e56c · 9cff11db · 563919c3
Commit 563919c3 authored Sep 27, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 27, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

drain.go pkg/kubectl/cmd/drain.go +5 -0

No files found.
--- a/pkg/kubectl/cmd/drain.go
+++ b/pkg/kubectl/cmd/drain.go
@@ -267,6 +267,11 @@ func (o *DrainOptions) getPodCreator(pod api.Pod) (*api.SerializedReference, err
 }
 func (o *DrainOptions) unreplicatedFilter(pod api.Pod) (bool, *warning, *fatal) {
+	// any finished pod can be removed
+	if pod.Status.Phase == api.PodSucceeded || pod.Status.Phase == api.PodFailed {
+		return true, nil, nil
+	}
 	sr, err := o.getPodCreator(pod)
 	if err != nil {
 		return false, nil, &fatal{err.Error()}