From 0c447c59db955d687f6025f4db03a01b7e77857a Mon Sep 17 00:00:00 2001 From: Minhan Xia Date: Tue, 25 Jul 2017 16:45:24 -0700 Subject: [PATCH] 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. --- pkg/cloudprovider/providers/gce/gce.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index bf5f1ee0dbb..614c08a8785 100644 --- 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,