Merge pull request #12957 from smarterclayton/handle_terminating_pods

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-08-20 21:47:00 -07:00
47 changed files with 561 additions and 94 deletions

View File

@@ -435,6 +435,9 @@ func printPod(pod *api.Pod, w io.Writer, withNamespace bool, wide bool, showAll
readyContainers++
}
}
if pod.DeletionTimestamp != nil {
reason = "Terminating"
}
if withNamespace {
if _, err := fmt.Fprintf(w, "%s\t", namespace); err != nil {