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

testing fixed 

hack/verify-gofmt.sh and hack/verify-flags-underscore.py
pull/6/head
Koonwah Chen 2017-06-29 10:42:29 -07:00
parent c4e84e263c
commit 0db5b37165
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/verify-flags/known-flags.txt
View File

@ -297,6 +297,7 @@ gather-logs-sizes
gather-metrics-at-teardown
gather-resource-usage
gather-suite-metrics-at-teardown
gce-api-endpoint
gce-multizone
gce-project
gce-service-account

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

@ -194,16 +194,16 @@ func newGCECloud(config io.Reader) (*GCECloud, error) {
projectID = cfg.Global.ProjectID
}
if cfg.Global.NetworkName != "" && strings.Contains(cfg.Global.NetworkName, "/"){
if cfg.Global.NetworkName != "" && strings.Contains(cfg.Global.NetworkName, "/") {
networkURL = cfg.Global.NetworkName
}else {
} 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 != "" && strings.Contains(cfg.Global.SubnetworkName, "/") {
subnetworkURL = cfg.Global.SubnetworkName
} else {
subnetworkURL = gceSubnetworkURL(apiEndpoint, cfg.Global.ProjectID, region, cfg.Global.SubnetworkName)
}
if cfg.Global.TokenURL != "" {
tokenSource = NewAltTokenSource(cfg.Global.TokenURL, cfg.Global.TokenBody)