From 3ee822de67d3d59db1a6a74a9161a07f238e11e7 Mon Sep 17 00:00:00 2001 From: Nick Sardo Date: Thu, 20 Jul 2017 15:41:34 -0700 Subject: [PATCH] Fix network/subnet url logic --- pkg/cloudprovider/providers/gce/gce.go | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index a43740151c..bf5f1ee0db 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -211,17 +211,22 @@ func newGCECloud(config io.Reader) (*GCECloud, error) { projectID = cfg.Global.ProjectID } - if cfg.Global.NetworkName != "" && strings.Contains(cfg.Global.NetworkName, "/") { - networkURL = cfg.Global.NetworkName - } else { - networkURL = gceNetworkURL(apiEndpoint, projectID, networkName) + if cfg.Global.NetworkName != "" { + if strings.Contains(cfg.Global.NetworkName, "/") { + networkURL = cfg.Global.NetworkName + } else { + networkURL = gceNetworkURL(apiEndpoint, projectID, networkName) + } } - if cfg.Global.SubnetworkName != "" && strings.Contains(cfg.Global.SubnetworkName, "/") { - subnetworkURL = cfg.Global.SubnetworkName - } else { - subnetworkURL = gceSubnetworkURL(apiEndpoint, cfg.Global.ProjectID, region, cfg.Global.SubnetworkName) + if cfg.Global.SubnetworkName != "" { + if strings.Contains(cfg.Global.SubnetworkName, "/") { + subnetworkURL = cfg.Global.SubnetworkName + } else { + subnetworkURL = gceSubnetworkURL(apiEndpoint, projectID, region, cfg.Global.SubnetworkName) + } } + if cfg.Global.TokenURL != "" { tokenSource = NewAltTokenSource(cfg.Global.TokenURL, cfg.Global.TokenBody) }