kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1405 from justinsb/get_clusters_should_print_zones 

kops get clusters should print zones
This commit is contained in:
Kris Nova 2017-01-09 10:38:32 -05:00 committed by GitHub
parent 5b6562da89 ed78a2b18f
commit 9382ede351
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/kops/get_cluster.go
View File

@ -27,6 +27,7 @@ import (
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/util/pkg/tables"
k8sapi "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/util/sets"
)
type GetClusterOptions struct {
@ -126,14 +127,14 @@ func RunGetClusters(context Factory, out io.Writer, options *GetClusterOptions)
t.AddColumn("CLOUD", func(c *api.Cluster) string {
return c.Spec.CloudProvider
})
t.AddColumn("SUBNETS", func(c *api.Cluster) string {
var subnetNames []string
t.AddColumn("ZONES", func(c *api.Cluster) string {
zones := sets.NewString()
for _, s := range c.Spec.Subnets {
subnetNames = append(subnetNames, s.Name)
zones.Insert(s.Zone)
}
return strings.Join(subnetNames, ",")
return strings.Join(zones.List(), ",")
})
return t.Render(clusters, out, "NAME", "CLOUD", "SUBNETS")
return t.Render(clusters, out, "NAME", "CLOUD", "ZONES")
case OutputYaml:
for i, cluster := range clusters {