github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Display node label

pull/6/head
Deyuan Deng 2014-11-22 11:33:02 -05:00
parent 162e4983b9
commit 6a42b66369
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/getting-started-guides/vagrant.md
View File

@ -78,8 +78,8 @@ You may need to build the binaries first, you can do this with ```make```
``` ```
$ export KUBERNETES_PROVIDER=vagrant $ export KUBERNETES_PROVIDER=vagrant
$ ./cluster/kubecfg.sh list /minions $ ./cluster/kubecfg.sh list /minions
Minion identifier Minion identifier Labels
---------- ---------- ----------
10.245.2.4 10.245.2.4
10.245.2.3 10.245.2.3
10.245.2.2 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 $ cluster/kubecfg.sh list /minions
Minion identifier Minion identifier Labels
---------- ---------- ----------
10.245.2.4 10.245.2.4
10.245.2.3 10.245.2.3
10.245.2.2 10.245.2.2

4
pkg/kubecfg/resource_printer.go
View File

@ -141,7 +141,7 @@ func (h *HumanReadablePrinter) validatePrintHandlerFunc(printFunc reflect.Value)
var podColumns = []string{"Name", "Image(s)", "Host", "Labels", "Status"} var podColumns = []string{"Name", "Image(s)", "Host", "Labels", "Status"}
var replicationControllerColumns = []string{"Name", "Image(s)", "Selector", "Replicas"} var replicationControllerColumns = []string{"Name", "Image(s)", "Selector", "Replicas"}
var serviceColumns = []string{"Name", "Labels", "Selector", "IP", "Port"} var serviceColumns = []string{"Name", "Labels", "Selector", "IP", "Port"}
var minionColumns = []string{"Minion identifier"} var minionColumns = []string{"Minion identifier", "Labels"}
var statusColumns = []string{"Status"} var statusColumns = []string{"Status"}
var eventColumns = []string{"Name", "Kind", "Status", "Reason", "Message"} 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 { 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 return err
} }

4
pkg/kubectl/resource_printer.go
View File

@ -190,7 +190,7 @@ func (h *HumanReadablePrinter) validatePrintHandlerFunc(printFunc reflect.Value)
var podColumns = []string{"NAME", "IMAGE(S)", "HOST", "LABELS", "STATUS"} var podColumns = []string{"NAME", "IMAGE(S)", "HOST", "LABELS", "STATUS"}
var replicationControllerColumns = []string{"NAME", "IMAGE(S)", "SELECTOR", "REPLICAS"} var replicationControllerColumns = []string{"NAME", "IMAGE(S)", "SELECTOR", "REPLICAS"}
var serviceColumns = []string{"NAME", "LABELS", "SELECTOR", "IP", "PORT"} var serviceColumns = []string{"NAME", "LABELS", "SELECTOR", "IP", "PORT"}
var minionColumns = []string{"NAME"} var minionColumns = []string{"NAME", "LABELS"}
var statusColumns = []string{"STATUS"} var statusColumns = []string{"STATUS"}
var eventColumns = []string{"NAME", "KIND", "STATUS", "REASON", "MESSAGE"} 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 { 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 return err
} }