Merge pull request #65345 from nicksardo/target-proxy-set

Automatic merge from submit-queue (batch tested with PRs 65024, 65287, 65345, 64693, 64941). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Change signature of SetUrlMapForTargetHTTPProxy **Special notes for your reviewer**: /assign MrHohn **Release note**: ```release-note NONE ```

Merge pull request #65345 from nicksardo/target-proxy-set
1996aa3e · Kubernetes Submit Queue · GitHub · 8888a43a · e7e28c2e · 1996aa3e
Unverified Commit 1996aa3e authored Jun 22, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

gce_targetproxy.go pkg/cloudprovider/providers/gce/gce_targetproxy.go +4 -4

No files found.
--- a/pkg/cloudprovider/providers/gce/gce_targetproxy.go
+++ b/pkg/cloudprovider/providers/gce/gce_targetproxy.go
@@ -48,11 +48,11 @@ func (gce *GCECloud) CreateTargetHttpProxy(proxy *compute.TargetHttpProxy) error
 }

 // SetUrlMapForTargetHttpProxy sets the given UrlMap for the given TargetHttpProxy.
-func (gce *GCECloud) SetUrlMapForTargetHttpProxy(proxy *compute.TargetHttpProxy, urlMap *compute.UrlMap) error {
+func (gce *GCECloud) SetUrlMapForTargetHttpProxy(proxy *compute.TargetHttpProxy, urlMapLink string) error {
 	ctx, cancel := cloud.ContextWithCallTimeout()
 	defer cancel()

-	ref := &compute.UrlMapReference{UrlMap: urlMap.SelfLink}
+	ref := &compute.UrlMapReference{UrlMap: urlMapLink}
 	mc := newTargetProxyMetricContext("set_url_map")
 	return mc.Observe(gce.c.TargetHttpProxies().SetUrlMap(ctx, meta.GlobalKey(proxy.Name), ref))
 }
@@ -98,12 +98,12 @@ func (gce *GCECloud) CreateTargetHttpsProxy(proxy *compute.TargetHttpsProxy) err
 }

 // SetUrlMapForTargetHttpsProxy sets the given UrlMap for the given TargetHttpsProxy.
-func (gce *GCECloud) SetUrlMapForTargetHttpsProxy(proxy *compute.TargetHttpsProxy, urlMap *compute.UrlMap) error {
+func (gce *GCECloud) SetUrlMapForTargetHttpsProxy(proxy *compute.TargetHttpsProxy, urlMapLink string) error {
 	ctx, cancel := cloud.ContextWithCallTimeout()
 	defer cancel()

 	mc := newTargetProxyMetricContext("set_url_map")
-	ref := &compute.UrlMapReference{UrlMap: urlMap.SelfLink}
+	ref := &compute.UrlMapReference{UrlMap: urlMapLink}
 	return mc.Observe(gce.c.TargetHttpsProxies().SetUrlMap(ctx, meta.GlobalKey(proxy.Name), ref))
 }