rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-18 16:36:41 +00:00
Code Issues Releases Wiki Activity

Update canal and calico to 3.1.1

Browse Source
This commit is contained in:
galal-hussein
2018-04-26 05:10:53 +02:00
parent cefe16eb78
commit 657f38b9f0
6 changed files with 253 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/defaults.go
View File

@@ -169,6 +169,9 @@ func (c *Cluster) setClusterNetworkDefaults() {
if c.Network.FlannelNetworkProvider != nil {
networkPluginConfigDefaultsMap[FlannelIface] = c.Network.FlannelNetworkProvider.Iface
}
if c.Network.CanalNetworkProvider != nil {
networkPluginConfigDefaultsMap[CanalIface] = c.Network.CanalNetworkProvider.Iface
}
for k, v := range networkPluginConfigDefaultsMap {
setDefaultIfEmptyMapValue(c.Network.Options, k, v)
}