From 10feb3e6fdb582c7d2c1f1cd544f4becbaa53827 Mon Sep 17 00:00:00 2001 From: AdoHe Date: Tue, 16 Feb 2016 23:14:12 -0500 Subject: [PATCH] change CONTROLLER, ReplicaSet and Job column titles to NAME --- pkg/kubectl/cmd/cmd_test.go | 8 ++++---- pkg/kubectl/resource_printer.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index 82783c34f15..71bec75fa99 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -363,8 +363,8 @@ func ExamplePrintReplicationControllerWithNamespace() { fmt.Printf("Unexpected error: %v", err) } // Output: - // NAMESPACE CONTROLLER REPLICAS AGE - // beep foo 1 10y + // NAMESPACE NAME REPLICAS AGE + // beep foo 1 10y } func ExamplePrintReplicationControllerWithWide() { @@ -404,8 +404,8 @@ func ExamplePrintReplicationControllerWithWide() { fmt.Printf("Unexpected error: %v", err) } // Output: - // CONTROLLER REPLICAS AGE CONTAINER(S) IMAGE(S) SELECTOR - // foo 1 10y foo someimage foo=bar + // NAME REPLICAS AGE CONTAINER(S) IMAGE(S) SELECTOR + // foo 1 10y foo someimage foo=bar } func ExamplePrintPodWithWideFormat() { diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index 5236dff7c8b..3cd2809f8fe 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -396,9 +396,9 @@ func (h *HumanReadablePrinter) HandledResources() []string { // pkg/kubectl/cmd/get.go to reflect the new resource type. var podColumns = []string{"NAME", "READY", "STATUS", "RESTARTS", "AGE"} var podTemplateColumns = []string{"TEMPLATE", "CONTAINER(S)", "IMAGE(S)", "PODLABELS"} -var replicationControllerColumns = []string{"CONTROLLER", "REPLICAS", "AGE"} -var replicaSetColumns = []string{"CONTROLLER", "REPLICAS", "AGE"} -var jobColumns = []string{"JOB", "SUCCESSFUL"} +var replicationControllerColumns = []string{"NAME", "REPLICAS", "AGE"} +var replicaSetColumns = []string{"NAME", "REPLICAS", "AGE"} +var jobColumns = []string{"NAME", "SUCCESSFUL"} var serviceColumns = []string{"NAME", "CLUSTER-IP", "EXTERNAL-IP", "PORT(S)", "AGE"} var ingressColumns = []string{"NAME", "RULE", "BACKEND", "ADDRESS"} var endpointColumns = []string{"NAME", "ENDPOINTS", "AGE"}