Merge pull request #49595 from freehan/cloud-provider-fix

Automatic merge from submit-queue (batch tested with PRs 49238, 49595, 43494, 47897, 48905) bug fixes in GCE cloud provider fixes: #49657 #49150 ```release-note NONE ```

Merge pull request #49595 from freehan/cloud-provider-fix
b751bdbd · Kubernetes Submit Queue · GitHub · 7056b5ba · 0c447c59 · b751bdbd
Commit b751bdbd authored Jul 28, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

gce.go pkg/cloudprovider/providers/gce/gce.go +2 -1

No files found.
--- a/pkg/cloudprovider/providers/gce/gce.go
+++ b/pkg/cloudprovider/providers/gce/gce.go
@@ -215,7 +215,7 @@ func newGCECloud(config io.Reader) (*GCECloud, error) {
 			if strings.Contains(cfg.Global.NetworkName, "/") {
 				networkURL = cfg.Global.NetworkName
 			} else {
-				networkURL = gceNetworkURL(apiEndpoint, projectID, networkName)
+				networkURL = gceNetworkURL(apiEndpoint, projectID, cfg.Global.NetworkName)
 			}
 		}
@@ -323,6 +323,7 @@ func CreateGCECloud(apiEndpoint, projectID, region, zone string, managedZones []
 	gce := &GCECloud{
 		service:                  service,
+		serviceAlpha:             serviceAlpha,
 		serviceBeta:              serviceBeta,
 		containerService:         containerService,
 		cloudkmsService:          cloudkmsService,