github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo capture of list clusters

Browse Source
This commit is contained in:
Nick Sardo
2017-05-04 18:06:10 -07:00
parent 4a51f8a186
commit 14d2cf85a6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cloudprovider/providers/gce/gce_clusters.go
View File

@@ -26,19 +26,18 @@ func newClustersMetricContext(request, zone string) *metricContext {
} }
func (gce *GCECloud) ListClusters() ([]string, error) { func (gce *GCECloud) ListClusters() ([]string, error) {
mc := newClustersMetricContext("list", "")
allClusters := []string{} allClusters := []string{}
for _, zone := range gce.managedZones { for _, zone := range gce.managedZones {
clusters, err := gce.listClustersInZone(zone) clusters, err := gce.listClustersInZone(zone)
if err != nil { if err != nil {
return nil, mc.Observe(err) return nil, err
} }
// TODO: Scoping? Do we need to qualify the cluster name? // TODO: Scoping? Do we need to qualify the cluster name?
allClusters = append(allClusters, clusters...) allClusters = append(allClusters, clusters...)
} }
return allClusters, mc.Observe(nil) return allClusters, nil
} }
func (gce *GCECloud) Master(clusterName string) (string, error) { func (gce *GCECloud) Master(clusterName string) (string, error) {