diff --git a/docs/getting-started-guides/vagrant.md b/docs/getting-started-guides/vagrant.md index 00538603d18..d4680b62ead 100644 --- a/docs/getting-started-guides/vagrant.md +++ b/docs/getting-started-guides/vagrant.md @@ -78,8 +78,8 @@ You may need to build the binaries first, you can do this with ```make``` ``` $ export KUBERNETES_PROVIDER=vagrant $ ./cluster/kubecfg.sh list /minions -Minion identifier ----------- +Minion identifier Labels +---------- ---------- 10.245.2.4 10.245.2.3 10.245.2.2 @@ -141,8 +141,8 @@ Your cluster is running, you can list the minions in your cluster: ``` $ cluster/kubecfg.sh list /minions -Minion identifier ----------- +Minion identifier Labels +---------- ---------- 10.245.2.4 10.245.2.3 10.245.2.2 diff --git a/pkg/kubecfg/resource_printer.go b/pkg/kubecfg/resource_printer.go index 15c086ebf9e..263525b377a 100644 --- a/pkg/kubecfg/resource_printer.go +++ b/pkg/kubecfg/resource_printer.go @@ -141,7 +141,7 @@ func (h *HumanReadablePrinter) validatePrintHandlerFunc(printFunc reflect.Value) var podColumns = []string{"Name", "Image(s)", "Host", "Labels", "Status"} var replicationControllerColumns = []string{"Name", "Image(s)", "Selector", "Replicas"} var serviceColumns = []string{"Name", "Labels", "Selector", "IP", "Port"} -var minionColumns = []string{"Minion identifier"} +var minionColumns = []string{"Minion identifier", "Labels"} var statusColumns = []string{"Status"} var eventColumns = []string{"Name", "Kind", "Status", "Reason", "Message"} @@ -249,7 +249,7 @@ func printServiceList(list *api.ServiceList, w io.Writer) error { } func printMinion(minion *api.Minion, w io.Writer) error { - _, err := fmt.Fprintf(w, "%s\n", minion.Name) + _, err := fmt.Fprintf(w, "%s\t%s\n", minion.Name, labels.Set(minion.Labels)) return err } diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index 530c2d301ec..a595fe2b201 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -190,7 +190,7 @@ func (h *HumanReadablePrinter) validatePrintHandlerFunc(printFunc reflect.Value) var podColumns = []string{"NAME", "IMAGE(S)", "HOST", "LABELS", "STATUS"} var replicationControllerColumns = []string{"NAME", "IMAGE(S)", "SELECTOR", "REPLICAS"} var serviceColumns = []string{"NAME", "LABELS", "SELECTOR", "IP", "PORT"} -var minionColumns = []string{"NAME"} +var minionColumns = []string{"NAME", "LABELS"} var statusColumns = []string{"STATUS"} var eventColumns = []string{"NAME", "KIND", "STATUS", "REASON", "MESSAGE"} @@ -298,7 +298,7 @@ func printServiceList(list *api.ServiceList, w io.Writer) error { } func printMinion(minion *api.Minion, w io.Writer) error { - _, err := fmt.Fprintf(w, "%s\n", minion.Name) + _, err := fmt.Fprintf(w, "%s\t%s\n", minion.Name, labels.Set(minion.Labels)) return err }