diff --git a/pkg/printers/internalversion/printers.go b/pkg/printers/internalversion/printers.go index 54b9010cf81..ac9460d9d98 100644 --- a/pkg/printers/internalversion/printers.go +++ b/pkg/printers/internalversion/printers.go @@ -73,7 +73,7 @@ var ( statefulSetColumns = []string{"NAME", "DESIRED", "CURRENT", "AGE"} endpointColumns = []string{"NAME", "ENDPOINTS", "AGE"} nodeColumns = []string{"NAME", "STATUS", "AGE", "VERSION"} - nodeWideColumns = []string{"EXTERNAL-IP", "OS-IMAGE", "KERNEL-VERSION"} + nodeWideColumns = []string{"EXTERNAL-IP", "OS-IMAGE", "KERNEL-VERSION", "CONTAINER-RUNTIME"} daemonSetColumns = []string{"NAME", "DESIRED", "CURRENT", "READY", "UP-TO-DATE", "AVAILABLE", "NODE-SELECTOR", "AGE"} daemonSetWideColumns = []string{"CONTAINER(S)", "IMAGE(S)", "SELECTOR"} eventColumns = []string{"LASTSEEN", "FIRSTSEEN", "COUNT", "NAME", "KIND", "SUBOBJECT", "TYPE", "REASON", "SOURCE", "MESSAGE"} @@ -1122,14 +1122,17 @@ func printNode(node *api.Node, w io.Writer, options printers.PrintOptions) error } if options.Wide { - osImage, kernelVersion := node.Status.NodeInfo.OSImage, node.Status.NodeInfo.KernelVersion + osImage, kernelVersion, crVersion := node.Status.NodeInfo.OSImage, node.Status.NodeInfo.KernelVersion, node.Status.NodeInfo.ContainerRuntimeVersion if osImage == "" { osImage = "" } if kernelVersion == "" { kernelVersion = "" } - if _, err := fmt.Fprintf(w, "\t%s\t%s\t%s", getNodeExternalIP(node), osImage, kernelVersion); err != nil { + if crVersion == "" { + crVersion = "" + } + if _, err := fmt.Fprintf(w, "\t%s\t%s\t%s\t%s", getNodeExternalIP(node), osImage, kernelVersion, crVersion); err != nil { return err } } diff --git a/pkg/printers/internalversion/printers_test.go b/pkg/printers/internalversion/printers_test.go index 46e21427e3c..e017bad7478 100644 --- a/pkg/printers/internalversion/printers_test.go +++ b/pkg/printers/internalversion/printers_test.go @@ -818,6 +818,51 @@ func TestPrintNodeKernelVersion(t *testing.T) { } } +func TestPrintNodeContainerRuntimeVersion(t *testing.T) { + printer := printers.NewHumanReadablePrinter(nil, nil, printers.PrintOptions{ + ColumnLabels: []string{}, + Wide: true, + }) + AddHandlers(printer) + + table := []struct { + node api.Node + containerRuntimeVersion string + }{ + { + node: api.Node{ + ObjectMeta: metav1.ObjectMeta{Name: "foo1"}, + Status: api.NodeStatus{ + NodeInfo: api.NodeSystemInfo{ContainerRuntimeVersion: "foo://1.2.3"}, + Addresses: []api.NodeAddress{{Type: api.NodeExternalIP, Address: "1.1.1.1"}}, + }, + }, + containerRuntimeVersion: "foo://1.2.3", + }, + { + node: api.Node{ + ObjectMeta: metav1.ObjectMeta{Name: "foo2"}, + Status: api.NodeStatus{ + NodeInfo: api.NodeSystemInfo{}, + Addresses: []api.NodeAddress{{Type: api.NodeExternalIP, Address: "1.1.1.1"}}, + }, + }, + containerRuntimeVersion: "", + }, + } + + for _, test := range table { + buffer := &bytes.Buffer{} + err := printer.PrintObj(&test.node, buffer) + if err != nil { + t.Fatalf("An error occurred printing Node: %#v", err) + } + if !contains(strings.Fields(buffer.String()), test.containerRuntimeVersion) { + t.Fatalf("Expect printing node %s with kernel version %#v, got: %#v", test.node.Name, test.containerRuntimeVersion, buffer.String()) + } + } +} + func TestPrintNodeName(t *testing.T) { printer := printers.NewHumanReadablePrinter(nil, nil, printers.PrintOptions{ Wide: true,