Merge pull request #21369 from AdoHe/kubectl_change_column_titles

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() {

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"}