github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #58501 from bowei/cp-zones

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 56948, 58365, 58501). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Update Zones to use generated code

Update Zones to use generated code
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-01-19 01:12:33 -08:00 committed by GitHub
commit 49c729eef4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cloudprovider/providers/gce/gce_zones.go
View File

@ -17,13 +17,14 @@ limitations under the License.
package gce package gce
import ( import (
"fmt" "context"
"strings" "strings"
compute "google.golang.org/api/compute/v1" compute "google.golang.org/api/compute/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/filter"
) )
func newZonesMetricContext(request, region string) *metricContext { func newZonesMetricContext(request, region string) *metricContext {
@ -72,12 +73,11 @@ func (gce *GCECloud) GetZoneByNodeName(nodeName types.NodeName) (cloudprovider.Z
// ListZonesInRegion returns all zones in a GCP region // ListZonesInRegion returns all zones in a GCP region
func (gce *GCECloud) ListZonesInRegion(region string) ([]*compute.Zone, error) { func (gce *GCECloud) ListZonesInRegion(region string) ([]*compute.Zone, error) {
mc := newZonesMetricContext("list", region) mc := newZonesMetricContext("list", region)
filter := fmt.Sprintf("region eq %v", gce.getRegionLink(region)) list, err := gce.c.Zones().List(context.Background(), filter.Regexp("region", gce.getRegionLink(region)))
list, err := gce.service.Zones.List(gce.projectID).Filter(filter).Do()
if err != nil { if err != nil {
return nil, mc.Observe(err) return nil, mc.Observe(err)
} }
return list.Items, mc.Observe(err) return list, mc.Observe(err)
} }
func (gce *GCECloud) getRegionLink(region string) string { func (gce *GCECloud) getRegionLink(region string) string {