Merge pull request #45788 from zhangxiaoyu-zidif/describe-pod-node-nil

Automatic merge from submit-queue (batch tested with PRs 45171, 43947, 45788, 45822, 45808) Display <none> for kubectl describe pod when node is empty. **What this PR does / why we need it**: Display <none> for kubectl describe pod when node is empty. **Special notes for your reviewer**: refer to #45572 **Release note**: ```release-note NONE ```

Merge pull request #45788 from zhangxiaoyu-zidif/describe-pod-node-nil
1e48f5b4 · Kubernetes Submit Queue · GitHub · 5b417e44 · de64f526 · 1e48f5b4
Commit 1e48f5b4 authored May 15, 2017 by Kubernetes Submit Queue Committed by GitHub May 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

describe.go pkg/printers/internalversion/describe.go +5 -1

No files found.
--- a/pkg/printers/internalversion/describe.go
+++ b/pkg/printers/internalversion/describe.go
@@ -604,7 +604,11 @@ func describePod(pod *api.Pod, events *api.EventList) (string, error) {
 		w := NewPrefixWriter(out)
 		w.Write(LEVEL_0, "Name:\t%s\n", pod.Name)
 		w.Write(LEVEL_0, "Namespace:\t%s\n", pod.Namespace)
-		w.Write(LEVEL_0, "Node:\t%s\n", pod.Spec.NodeName+"/"+pod.Status.HostIP)
+		if pod.Spec.NodeName == "" {
+			w.Write(LEVEL_0, "Node:\t<none>\n")
+		} else {
+			w.Write(LEVEL_0, "Node:\t%s\n", pod.Spec.NodeName+"/"+pod.Status.HostIP)
+		}
 		if pod.Status.StartTime != nil {
 			w.Write(LEVEL_0, "Start Time:\t%s\n", pod.Status.StartTime.Time.Format(time.RFC1123Z))
 		}