rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-16 13:56:34 +00:00
Code Issues Releases Wiki Activity

Update cluster network and cloud provider options

Browse Source
This commit is contained in:
galal-hussein 2018-04-02 23:28:40 +02:00
parent 915ccddaa5
commit 79eaedfa26
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/cluster.go
View File

@ -362,9 +362,9 @@ func (c *Cluster) getEtcdProcessHostMap(readyEtcdHosts []*hosts.Host) map[*hosts
func (c *Cluster) parseCloudConfig(ctx context.Context) (string, error) { func (c *Cluster) parseCloudConfig(ctx context.Context) (string, error) {
// check for azure cloud provider // check for azure cloud provider
if c.AzureCloudProvider.TenantID != "" { if c.CloudProvider.AzureCloudProvider != nil {
c.CloudProvider.Name = AzureCloudProvider c.CloudProvider.Name = AzureCloudProvider
jsonString, err := json.MarshalIndent(c.AzureCloudProvider, "", "\n") jsonString, err := json.MarshalIndent(c.CloudProvider.AzureCloudProvider, "", "\n")
if err != nil { if err != nil {
return "", err return "", err
} }

8
cluster/defaults.go
View File

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