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

Fixes bug where the network used in the cloud provider was not taken from the /etc/gce.conf configuration. 

This can result in firewalls, routes and other network resources being created on the wrong network.
pull/6/head
Minhan Xia 2017-07-25 16:45:24 -07:00
parent 6fbc554c6b
commit 0c447c59db
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,7 +215,7 @@ func newGCECloud(config io.Reader) (*GCECloud, error) {
if strings.Contains(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, cfg.Global.NetworkName)
} }
} }
@ -323,6 +323,7 @@ func CreateGCECloud(apiEndpoint, projectID, region, zone string, managedZones []
gce := &GCECloud{ gce := &GCECloud{
service: service, service: service,
serviceAlpha: serviceAlpha,
serviceBeta: serviceBeta, serviceBeta: serviceBeta,
containerService: containerService, containerService: containerService,
cloudkmsService: cloudkmsService, cloudkmsService: cloudkmsService,