Fix kubectl describe CSINode nil pointer error

This commit is contained in:
zhouya0 2020-03-30 17:10:40 +08:00
parent a329e67922
commit 55c455e61f

View File

@ -4031,12 +4031,16 @@ func describeCSINode(csi *storagev1.CSINode, events *corev1.EventList) (output s
w.Write(LEVEL_1, "Drivers:\n") w.Write(LEVEL_1, "Drivers:\n")
for _, driver := range csi.Spec.Drivers { for _, driver := range csi.Spec.Drivers {
w.Write(LEVEL_2, "%s:\n", driver.Name) w.Write(LEVEL_2, "%s:\n", driver.Name)
w.Write(LEVEL_3, "Node ID:\t%s\n", driver.NodeID)
if driver.Allocatable.Count != nil {
w.Write(LEVEL_3, "Allocatables:\n") w.Write(LEVEL_3, "Allocatables:\n")
w.Write(LEVEL_4, "Count:\t%d\n", *driver.Allocatable.Count) w.Write(LEVEL_4, "Count:\t%d\n", *driver.Allocatable.Count)
w.Write(LEVEL_3, "Node ID:\t%s\n", driver.NodeID) }
if driver.TopologyKeys != nil {
w.Write(LEVEL_3, "Topology Keys:\t%s\n", driver.TopologyKeys) w.Write(LEVEL_3, "Topology Keys:\t%s\n", driver.TopologyKeys)
} }
} }
}
if events != nil { if events != nil {
DescribeEvents(events, w) DescribeEvents(events, w)
} }