github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2017-07-20 23:01:18 -07:00 committed by GitHub
commit e6a4b5311c
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/cloudprovider/providers/gce/gce.go
View File

@ -211,17 +211,22 @@ func newGCECloud(config io.Reader) (*GCECloud, error) {
projectID = cfg.Global.ProjectID projectID = cfg.Global.ProjectID
} }
if cfg.Global.NetworkName != "" && strings.Contains(cfg.Global.NetworkName, "/") { if cfg.Global.NetworkName != "" {
if strings.Contains(cfg.Global.NetworkName, "/") {
networkURL = cfg.Global.NetworkName networkURL = cfg.Global.NetworkName
} else { } else {
networkURL = gceNetworkURL(apiEndpoint, projectID, networkName) networkURL = gceNetworkURL(apiEndpoint, projectID, networkName)
} }
}
if cfg.Global.SubnetworkName != "" && strings.Contains(cfg.Global.SubnetworkName, "/") { if cfg.Global.SubnetworkName != "" {
if strings.Contains(cfg.Global.SubnetworkName, "/") {
subnetworkURL = cfg.Global.SubnetworkName subnetworkURL = cfg.Global.SubnetworkName
} else { } else {
subnetworkURL = gceSubnetworkURL(apiEndpoint, cfg.Global.ProjectID, region, cfg.Global.SubnetworkName) subnetworkURL = gceSubnetworkURL(apiEndpoint, projectID, region, cfg.Global.SubnetworkName)
} }
}
if cfg.Global.TokenURL != "" { if cfg.Global.TokenURL != "" {
tokenSource = NewAltTokenSource(cfg.Global.TokenURL, cfg.Global.TokenBody) tokenSource = NewAltTokenSource(cfg.Global.TokenURL, cfg.Global.TokenBody)
} }