github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20693 from thockin/e2e-util-region-not-zone

Browse Source 
e2e util: Pass region, not zone
This commit is contained in:
Tim Hockin 2016-02-04 22:36:40 -08:00
commit 91c4f89de6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/util.go
View File

@ -2814,16 +2814,18 @@ func EnsureLoadBalancerResourcesDeleted(ip, portRange string) error {
func ensureGCELoadBalancerResourcesDeleted(ip, portRange string) error {
gceCloud, ok := testContext.CloudConfig.Provider.(*gcecloud.GCECloud)
project := testContext.CloudConfig.ProjectID
zone := testContext.CloudConfig.Zone
if !ok {
return fmt.Errorf("failed to convert CloudConfig.Provider to GCECloud: %#v", testContext.CloudConfig.Provider)
}
project := testContext.CloudConfig.ProjectID
region, err := gcecloud.GetGCERegion(testContext.CloudConfig.Zone)
if err != nil {
return fmt.Errorf("could not get region for zone %q: %v", testContext.CloudConfig.Zone, err)
}
return wait.Poll(10*time.Second, 5*time.Minute, func() (bool, error) {
service := gceCloud.GetComputeService()
list, err := service.ForwardingRules.List(project, zone).Do()
list, err := service.ForwardingRules.List(project, region).Do()
if err != nil {
return false, err
}