github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix network/subnet url logic

pull/6/head
Nick Sardo 2017-07-20 15:41:34 -07:00
parent 042913d898
commit 3ee822de67
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
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 != "" {
networkURL = cfg.Global.NetworkName if strings.Contains(cfg.Global.NetworkName, "/") {
} else { networkURL = cfg.Global.NetworkName
networkURL = gceNetworkURL(apiEndpoint, projectID, networkName) } else {
networkURL = gceNetworkURL(apiEndpoint, projectID, networkName)
}
} }
if cfg.Global.SubnetworkName != "" && strings.Contains(cfg.Global.SubnetworkName, "/") { if cfg.Global.SubnetworkName != "" {
subnetworkURL = cfg.Global.SubnetworkName if strings.Contains(cfg.Global.SubnetworkName, "/") {
} else { subnetworkURL = cfg.Global.SubnetworkName
subnetworkURL = gceSubnetworkURL(apiEndpoint, cfg.Global.ProjectID, region, cfg.Global.SubnetworkName) } else {
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)
} }