diff --git a/pkg/cloudprovider/providers/gce/BUILD b/pkg/cloudprovider/providers/gce/BUILD index 2d407afb860..2155b28cde1 100644 --- a/pkg/cloudprovider/providers/gce/BUILD +++ b/pkg/cloudprovider/providers/gce/BUILD @@ -13,6 +13,8 @@ go_library( srcs = [ "doc.go", "gce.go", + "gce_addresses.go", + "gce_annotations.go", "gce_backendservice.go", "gce_cert.go", "gce_clusterid.go", @@ -24,9 +26,12 @@ go_library( "gce_instancegroup.go", "gce_instances.go", "gce_loadbalancer.go", + "gce_loadbalancer_external.go", + "gce_loadbalancer_internal.go", + "gce_loadbalancer_naming.go", "gce_op.go", "gce_routes.go", - "gce_staticip.go", + "gce_targetpool.go", "gce_targetproxy.go", "gce_urlmap.go", "gce_util.go", diff --git a/test/e2e/framework/ingress_utils.go b/test/e2e/framework/ingress_utils.go index 4b9912bcb9a..6d6969cd8d0 100644 --- a/test/e2e/framework/ingress_utils.go +++ b/test/e2e/framework/ingress_utils.go @@ -717,9 +717,10 @@ func (cont *GCEIngressController) Init() { // invoking deleteStaticIPs. func (cont *GCEIngressController) CreateStaticIP(name string) string { gceCloud := cont.Cloud.Provider.(*gcecloud.GCECloud) - ip, err := gceCloud.ReserveGlobalStaticIP(name, "") + addr := &compute.Address{Name: name} + ip, err := gceCloud.ReserveGlobalAddress(addr) if err != nil { - if delErr := gceCloud.DeleteGlobalStaticIP(name); delErr != nil { + if delErr := gceCloud.DeleteGlobalAddress(name); delErr != nil { if cont.isHTTPErrorCode(delErr, http.StatusNotFound) { Logf("Static ip with name %v was not allocated, nothing to delete", name) } else { diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 0f31c013ed9..37cf069d130 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -5167,20 +5167,15 @@ func CleanupGCEResources(loadBalancerName string) (retErr error) { !IsGoogleAPIHTTPErrorCode(err, http.StatusNotFound) { retErr = err } - if err := gceCloud.DeleteForwardingRule(loadBalancerName); err != nil && + if err := gceCloud.DeleteRegionForwardingRule(loadBalancerName, gceCloud.Region()); err != nil && !IsGoogleAPIHTTPErrorCode(err, http.StatusNotFound) { retErr = fmt.Errorf("%v\n%v", retErr, err) } - if err := gceCloud.DeleteGlobalStaticIP(loadBalancerName); err != nil && + if err := gceCloud.DeleteRegionAddress(loadBalancerName, gceCloud.Region()); err != nil && !IsGoogleAPIHTTPErrorCode(err, http.StatusNotFound) { retErr = fmt.Errorf("%v\n%v", retErr, err) } - // This function shells out to gcloud, so we can't compare for NotFound errors. - // TODO: Invoke cloudprovider method directly instead. - if err := DeleteGCEStaticIP(loadBalancerName); err != nil { - Logf("%v", err) - } var hcNames []string hc, getErr := gceCloud.GetHttpHealthCheck(loadBalancerName) if getErr != nil && !IsGoogleAPIHTTPErrorCode(getErr, http.StatusNotFound) { @@ -5190,7 +5185,7 @@ func CleanupGCEResources(loadBalancerName string) (retErr error) { if hc != nil { hcNames = append(hcNames, hc.Name) } - if err := gceCloud.DeleteTargetPool(loadBalancerName, hcNames...); err != nil && + if err := gceCloud.DeleteExternalTargetPoolAndChecks(loadBalancerName, gceCloud.Region(), hcNames...); err != nil && !IsGoogleAPIHTTPErrorCode(err, http.StatusNotFound) { retErr = fmt.Errorf("%v\n%v", retErr, err) }