Merge pull request kubernetes#75863 from cwdsuzhou/optimize-describe-pvc-organization

k8s-ci-robot · web-flow · commit 30165e40ddfb · 2019-03-29T11:49:03.000-07:00
Optimize describe pvc output organization
diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go
@@ -1511,6 +1511,8 @@ func describePersistentVolumeClaim(pvc *corev1.PersistentVolumeClaim, events *co
 		if pvc.Spec.VolumeMode != nil {
 			w.Write(LEVEL_0, "VolumeMode:\t%v\n", *pvc.Spec.VolumeMode)
 		}
+		printPodsMultiline(w, "Mounted By", mountPods)
+
 		if len(pvc.Status.Conditions) > 0 {
 			w.Write(LEVEL_0, "Conditions:\n")
 			w.Write(LEVEL_1, "Type\tStatus\tLastProbeTime\tLastTransitionTime\tReason\tMessage\n")
@@ -1529,8 +1531,6 @@ func describePersistentVolumeClaim(pvc *corev1.PersistentVolumeClaim, events *co
 			DescribeEvents(events, w)
 		}
 
-		printPodsMultiline(w, "Mounted By", mountPods)
-
 		return nil
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -1511,6 +1511,8 @@ func describePersistentVolumeClaim(pvc corev1.PersistentVolumeClaim, events co`
`1511`	`1511`	`if pvc.Spec.VolumeMode != nil {`
`1512`	`1512`	`w.Write(LEVEL_0, "VolumeMode:\t%v\n", *pvc.Spec.VolumeMode)`
`1513`	`1513`	`}`
	`1514`	`+ printPodsMultiline(w, "Mounted By", mountPods)`
	`1515`	`+`
`1514`	`1516`	`if len(pvc.Status.Conditions) > 0 {`
`1515`	`1517`	`w.Write(LEVEL_0, "Conditions:\n")`
`1516`	`1518`	`w.Write(LEVEL_1, "Type\tStatus\tLastProbeTime\tLastTransitionTime\tReason\tMessage\n")`
`@@ -1529,8 +1531,6 @@ func describePersistentVolumeClaim(pvc corev1.PersistentVolumeClaim, events co`
`1529`	`1531`	`DescribeEvents(events, w)`
`1530`	`1532`	`}`
`1531`	`1533`
`1532`		`- printPodsMultiline(w, "Mounted By", mountPods)`
`1533`		`-`
`1534`	`1534`	`return nil`
`1535`	`1535`	`})`
`1536`	`1536`	`}`