From b05faf9f4a422d767e46c4a0a6718044a826edbe Mon Sep 17 00:00:00 2001 From: moelsayed Date: Wed, 9 May 2018 01:53:19 +0200 Subject: [PATCH] Fix empty default calico cloud provider --- cluster/defaults.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/defaults.go b/cluster/defaults.go index 246b5729..e12fbd80 100644 --- a/cluster/defaults.go +++ b/cluster/defaults.go @@ -156,14 +156,15 @@ func (c *Cluster) setClusterNetworkDefaults() { c.Network.Options = 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 { - case CalicoNetworkPlugin: networkPluginConfigDefaultsMap = map[string]string{ CalicoCloudProvider: DefaultNetworkCloudProvider, } } if c.Network.CalicoNetworkProvider != nil { + setDefaultIfEmpty(&c.Network.CalicoNetworkProvider.CloudProvider, DefaultNetworkCloudProvider) networkPluginConfigDefaultsMap[CalicoCloudProvider] = c.Network.CalicoNetworkProvider.CloudProvider } if c.Network.FlannelNetworkProvider != nil { @@ -175,5 +176,4 @@ func (c *Cluster) setClusterNetworkDefaults() { for k, v := range networkPluginConfigDefaultsMap { setDefaultIfEmptyMapValue(c.Network.Options, k, v) } - }