rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-17 07:30:01 +00:00
Code Issues Releases Wiki Activity

Fix empty default calico cloud provider

Browse Source
This commit is contained in:
moelsayed
2018-05-09 01:53:19 +02:00
parent 5d718ad123
commit b05faf9f4a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/defaults.go
View File

@@ -156,14 +156,15 @@ func (c *Cluster) setClusterNetworkDefaults() {
c.Network.Options = make(map[string]string) c.Network.Options = make(map[string]string)
} }
networkPluginConfigDefaultsMap := make(map[string]string) networkPluginConfigDefaultsMap := make(map[string]string)
// This is still needed because RKE doesn't use c.Network.*NetworkProvider, that's a rancher type
switch c.Network.Plugin { switch c.Network.Plugin {
case CalicoNetworkPlugin: case CalicoNetworkPlugin:
networkPluginConfigDefaultsMap = map[string]string{ networkPluginConfigDefaultsMap = map[string]string{
CalicoCloudProvider: DefaultNetworkCloudProvider, CalicoCloudProvider: DefaultNetworkCloudProvider,
} }
} }
if c.Network.CalicoNetworkProvider != nil { if c.Network.CalicoNetworkProvider != nil {
setDefaultIfEmpty(&c.Network.CalicoNetworkProvider.CloudProvider, DefaultNetworkCloudProvider)
networkPluginConfigDefaultsMap[CalicoCloudProvider] = c.Network.CalicoNetworkProvider.CloudProvider networkPluginConfigDefaultsMap[CalicoCloudProvider] = c.Network.CalicoNetworkProvider.CloudProvider
} }
if c.Network.FlannelNetworkProvider != nil { if c.Network.FlannelNetworkProvider != nil {
@@ -175,5 +176,4 @@ func (c *Cluster) setClusterNetworkDefaults() {
for k, v := range networkPluginConfigDefaultsMap { for k, v := range networkPluginConfigDefaultsMap {
setDefaultIfEmptyMapValue(c.Network.Options, k, v) setDefaultIfEmptyMapValue(c.Network.Options, k, v)
} }
} }