From 79eaedfa266b9722f68e34291779c6c4e70afd22 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Mon, 2 Apr 2018 23:28:40 +0200 Subject: [PATCH] Update cluster network and cloud provider options --- cluster/cluster.go | 4 ++-- cluster/defaults.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cluster/cluster.go b/cluster/cluster.go index cd2cbde8..792b2e15 100644 --- a/cluster/cluster.go +++ b/cluster/cluster.go @@ -362,9 +362,9 @@ func (c *Cluster) getEtcdProcessHostMap(readyEtcdHosts []*hosts.Host) map[*hosts func (c *Cluster) parseCloudConfig(ctx context.Context) (string, error) { // check for azure cloud provider - if c.AzureCloudProvider.TenantID != "" { + if c.CloudProvider.AzureCloudProvider != nil { c.CloudProvider.Name = AzureCloudProvider - jsonString, err := json.MarshalIndent(c.AzureCloudProvider, "", "\n") + jsonString, err := json.MarshalIndent(c.CloudProvider.AzureCloudProvider, "", "\n") if err != nil { return "", err } diff --git a/cluster/defaults.go b/cluster/defaults.go index d594e653..16d716b9 100644 --- a/cluster/defaults.go +++ b/cluster/defaults.go @@ -175,11 +175,11 @@ func (c *Cluster) setClusterNetworkDefaults() { CalicoCloudProvider: DefaultNetworkCloudProvider, } } - if c.CalicoNetworkProvider.CloudProvider != "" { - networkPluginConfigDefaultsMap[CalicoCloudProvider] = c.CalicoNetworkProvider.CloudProvider + if c.Network.CalicoNetworkProvider != nil { + networkPluginConfigDefaultsMap[CalicoCloudProvider] = c.Network.CalicoNetworkProvider.CloudProvider } - if c.FlannelNetworkProvider.Iface != "" { - networkPluginConfigDefaultsMap[FlannelIface] = c.FlannelNetworkProvider.Iface + if c.Network.FlannelNetworkProvider != nil { + networkPluginConfigDefaultsMap[FlannelIface] = c.Network.FlannelNetworkProvider.Iface } for k, v := range networkPluginConfigDefaultsMap { setDefaultIfEmptyMapValue(c.Network.Options, k, v)