Optimize descrive pvc output organization

caiweidong · caiweidong · commit 732ef847e8e6 · 2019-03-29T11:29:09.000+08:00
diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go
@@ -1492,6 +1492,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")
@@ -1510,8 +1512,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
`@@ -1492,6 +1492,8 @@ func describePersistentVolumeClaim(pvc corev1.PersistentVolumeClaim, events co`
`1492`	`1492`	`if pvc.Spec.VolumeMode != nil {`
`1493`	`1493`	`w.Write(LEVEL_0, "VolumeMode:\t%v\n", *pvc.Spec.VolumeMode)`
`1494`	`1494`	`}`
	`1495`	`+ printPodsMultiline(w, "Mounted By", mountPods)`
	`1496`	`+`
`1495`	`1497`	`if len(pvc.Status.Conditions) > 0 {`
`1496`	`1498`	`w.Write(LEVEL_0, "Conditions:\n")`
`1497`	`1499`	`w.Write(LEVEL_1, "Type\tStatus\tLastProbeTime\tLastTransitionTime\tReason\tMessage\n")`
`@@ -1510,8 +1512,6 @@ func describePersistentVolumeClaim(pvc corev1.PersistentVolumeClaim, events co`
`1510`	`1512`	`DescribeEvents(events, w)`
`1511`	`1513`	`}`
`1512`	`1514`
`1513`		`- printPodsMultiline(w, "Mounted By", mountPods)`
`1514`		`-`
`1515`	`1515`	`return nil`
`1516`	`1516`	`})`
`1517`	`1517`	`}`