Merge pull request #49333 from nicksardo/gce-fix-subnetlogic

Automatic merge from submit-queue (batch tested with PRs 49222, 49333, 48708, 49337) GCE: Fix network/subnet url logic Split if conditions: fixes #48521 /assign @bowei ```release-note NONE ```

Merge pull request #49333 from nicksardo/gce-fix-subnetlogic
e6a4b531 · Kubernetes Submit Queue · GitHub · d2c5dd64 · 3ee822de · e6a4b531
Commit e6a4b531 authored Jul 20, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 8 deletions

gce.go pkg/cloudprovider/providers/gce/gce.go +13 -8

No files found.
--- 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)
 		}