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

Merge pull request #92883 from jingxu97/July/listzones

Browse Source 
Fix ListZonesInRegion() after client BasePath change
This commit is contained in:
Kubernetes Prow Robot 2020-07-12 06:58:39 -07:00 committed by GitHub
commit cbb779e9b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/legacy-cloud-providers/gce/gce_zones.go
View File

@ -20,6 +20,7 @@ package gce
import ( import (
"context" "context"
"fmt"
"strings" "strings"
compute "google.golang.org/api/compute/v1" compute "google.golang.org/api/compute/v1"
@ -79,7 +80,9 @@ func (g *Cloud) ListZonesInRegion(region string) ([]*compute.Zone, error) {
defer cancel() defer cancel()
mc := newZonesMetricContext("list", region) mc := newZonesMetricContext("list", region)
list, err := g.c.Zones().List(ctx, filter.Regexp("region", g.getRegionLink(region))) // Use regex match instead of an exact regional link constructed from getRegionalLink below.
// See comments in issue kubernetes/kubernetes#87905
list, err := g.c.Zones().List(ctx, filter.Regexp("region", fmt.Sprintf(".*/regions/%s", region)))
if err != nil { if err != nil {
return nil, mc.Observe(err) return nil, mc.Observe(err)
} }