From 5b97e1b375ca2dd22c8d6be207da1d7982e1dca5 Mon Sep 17 00:00:00 2001 From: Zihong Zheng Date: Wed, 17 Jan 2018 18:22:09 -0800 Subject: [PATCH] Update gce call to use wrapper in gce_loadbalancer_external --- .../providers/gce/gce_loadbalancer_external.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_external.go b/pkg/cloudprovider/providers/gce/gce_loadbalancer_external.go index aabef25feb7..30f49460b0d 100644 --- a/pkg/cloudprovider/providers/gce/gce_loadbalancer_external.go +++ b/pkg/cloudprovider/providers/gce/gce_loadbalancer_external.go @@ -319,7 +319,7 @@ func (gce *GCECloud) updateExternalLoadBalancer(clusterName string, service *v1. } loadBalancerName := cloudprovider.GetLoadBalancerName(service) - pool, err := gce.service.TargetPools.Get(gce.projectID, gce.region, loadBalancerName).Do() + pool, err := gce.GetTargetPool(loadBalancerName, gce.region) if err != nil { return err } @@ -648,7 +648,7 @@ func (gce *GCECloud) ensureHttpHealthCheck(name, path string, port int32) (hc *c // Returns whether the forwarding rule exists, whether it needs to be updated, // what its IP address is (if it exists), and any error we encountered. func (gce *GCECloud) forwardingRuleNeedsUpdate(name, region string, loadBalancerIP string, ports []v1.ServicePort) (exists bool, needsUpdate bool, ipAddress string, err error) { - fwd, err := gce.service.ForwardingRules.Get(gce.projectID, region, name).Do() + fwd, err := gce.GetRegionForwardingRule(name, region) if err != nil { if isHTTPErrorCode(err, http.StatusNotFound) { return false, true, "", nil @@ -687,7 +687,7 @@ func (gce *GCECloud) forwardingRuleNeedsUpdate(name, region string, loadBalancer // Doesn't check whether the hosts have changed, since host updating is handled // separately. func (gce *GCECloud) targetPoolNeedsUpdate(name, region string, affinityType v1.ServiceAffinity) (exists bool, needsUpdate bool, err error) { - tp, err := gce.service.TargetPools.Get(gce.projectID, region, name).Do() + tp, err := gce.GetTargetPool(name, region) if err != nil { if isHTTPErrorCode(err, http.StatusNotFound) { return false, true, nil @@ -773,7 +773,7 @@ func translateAffinityType(affinityType v1.ServiceAffinity) string { } func (gce *GCECloud) firewallNeedsUpdate(name, serviceName, region, ipAddress string, ports []v1.ServicePort, sourceRanges netsets.IPNet) (exists bool, needsUpdate bool, err error) { - fw, err := gce.service.Firewalls.Get(gce.NetworkProjectID(), MakeFirewallName(name)).Do() + fw, err := gce.GetFirewall(MakeFirewallName(name)) if err != nil { if isHTTPErrorCode(err, http.StatusNotFound) { return false, true, nil @@ -820,7 +820,7 @@ func (gce *GCECloud) ensureHttpHealthCheckFirewall(svc *v1.Service, serviceName, ports := []v1.ServicePort{{Protocol: "tcp", Port: hcPort}} fwName := MakeHealthCheckFirewallName(clusterID, hcName, isNodesHealthCheck) - fw, err := gce.service.Firewalls.Get(gce.NetworkProjectID(), fwName).Do() + fw, err := gce.GetFirewall(fwName) if err != nil { if !isHTTPErrorCode(err, http.StatusNotFound) { return fmt.Errorf("error getting firewall for health checks: %v", err)