github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

delete forwardingRules instead of globalForwardingRules

Browse Source
This commit is contained in:
mfanjie 2016-09-08 10:44:36 +08:00 committed by fmeng
parent 127e1b6115
commit 66381c6694
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1446,6 +1446,14 @@ func (gce *GCECloud) deleteForwardingRule(name, region string) error {
return nil return nil
} }
func (gce *GCECloud) DeleteForwardingRule(name string) error {
region, err := GetGCERegion(gce.localZone)
if err != nil {
return err
}
return gce.deleteForwardingRule(name, region)
}
// DeleteTargetPool deletes the given target pool. // DeleteTargetPool deletes the given target pool.
func (gce *GCECloud) DeleteTargetPool(name string, hc *compute.HttpHealthCheck) error { func (gce *GCECloud) DeleteTargetPool(name string, hc *compute.HttpHealthCheck) error {
region, err := GetGCERegion(gce.localZone) region, err := GetGCERegion(gce.localZone)

2
test/e2e/framework/util.go
View File

@ -4589,7 +4589,7 @@ func CleanupGCEResources(loadBalancerName string) (err error) {
return fmt.Errorf("failed to convert CloudConfig.Provider to GCECloud: %#v", TestContext.CloudConfig.Provider) return fmt.Errorf("failed to convert CloudConfig.Provider to GCECloud: %#v", TestContext.CloudConfig.Provider)
} }
gceCloud.DeleteFirewall(loadBalancerName) gceCloud.DeleteFirewall(loadBalancerName)
gceCloud.DeleteGlobalForwardingRule(loadBalancerName) gceCloud.DeleteForwardingRule(loadBalancerName)
gceCloud.DeleteGlobalStaticIP(loadBalancerName) gceCloud.DeleteGlobalStaticIP(loadBalancerName)
hc, _ := gceCloud.GetHttpHealthCheck(loadBalancerName) hc, _ := gceCloud.GetHttpHealthCheck(loadBalancerName)
gceCloud.DeleteTargetPool(loadBalancerName, hc) gceCloud.DeleteTargetPool(loadBalancerName, hc)