Fixes bug where the network used in the cloud provider was not taken from the…

Fixes bug where the network used in the cloud provider was not taken from the /etc/gce.conf configuration. This can result in firewalls, routes and other network resources being created on the wrong network.

Fixes bug where the network used in the cloud provider was not taken from the…
0c447c59 · Minhan Xia · 6fbc554c · 0c447c59
Commit 0c447c59 authored Jul 25, 2017 by Minhan Xia
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,