Skip to content

K
k3s
Commit 0c447c59 authored by Minhan Xia's avatar Minhan Xia
Browse files
Options

Fixes bug where the network used in the cloud provider was not taken from the…

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.
parent 6fbc554c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
pkg/cloudprovider/providers/gce/gce.go
View file @ 0c447c59
...@@ -215,7 +215,7 @@ func newGCECloud(config io.Reader) (*GCECloud, error) { ...@@ -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 [] ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment