1
0
mirror of https://github.com/rancher/rke.git synced 2025-08-31 22:46:25 +00:00

Merge pull request #452 from galal-hussein/strong_types

Network and cloud provider types for rke
This commit is contained in:
Alena Prokharchyk
2018-03-29 14:00:21 -07:00
committed by GitHub
17 changed files with 900 additions and 152 deletions

View File

@@ -175,6 +175,12 @@ func (c *Cluster) setClusterNetworkDefaults() {
CalicoCloudProvider: DefaultNetworkCloudProvider,
}
}
if c.CalicoNetworkProvider.CloudProvider != "" {
networkPluginConfigDefaultsMap[CalicoCloudProvider] = c.CalicoNetworkProvider.CloudProvider
}
if c.FlannelNetworkProvider.Iface != "" {
networkPluginConfigDefaultsMap[FlannelIface] = c.FlannelNetworkProvider.Iface
}
for k, v := range networkPluginConfigDefaultsMap {
setDefaultIfEmptyMapValue(c.Network.Options, k, v)
}