Merge pull request #48821 from janetkuo/automated-cherry-pick-of-#487…

…86-upstream-release-1.7

Automatic merge from submit-queue

Automated cherry pick of #48786 upstream release 1.7

Cherrypick #48786 to fix a regression in 1.7

pkg/kubectl/resource_filter.go

@@ -38,21 +38,18 @@ func NewResourceFilter() Filters {
 }
 
 // filterPods returns true if a pod should be skipped.
-// defaults to true for terminated pods
+// If show-all is true, the pod will be never be skipped (return false);
+// otherwise, skip terminated pod.
 func filterPods(obj runtime.Object, options printers.PrintOptions) bool {
+	if options.ShowAll {
+		return false
+	}
+
 	switch p := obj.(type) {
 	case *v1.Pod:
-		reason := string(p.Status.Phase)
-		if p.Status.Reason != "" {
-			reason = p.Status.Reason
-		}
-		return !options.ShowAll && (reason == string(v1.PodSucceeded) || reason == string(v1.PodFailed))
+		return p.Status.Phase == v1.PodSucceeded || p.Status.Phase == v1.PodFailed
 	case *api.Pod:
-		reason := string(p.Status.Phase)
-		if p.Status.Reason != "" {
-			reason = p.Status.Reason
-		}
-		return !options.ShowAll && (reason == string(api.PodSucceeded) || reason == string(api.PodFailed))
+		return p.Status.Phase == api.PodSucceeded || p.Status.Phase == api.PodFailed
 	}
 	return false
 }