Finished pods can be drained

- Don't bother trying to filter pods that have succeeded or failed

Finished pods can be drained
9cff11db · Michael Fraenkel · 09e3fb35 · 9cff11db
Commit 9cff11db authored Aug 30, 2016 by Michael Fraenkel
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
@@ -260,6 +260,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()}