From 6b94c4a3fbdc1eba492a0df7e7aeafcd0e524a9a Mon Sep 17 00:00:00 2001 From: rajashree Date: Thu, 12 Mar 2020 23:56:11 -0700 Subject: [PATCH] Retain user-configured dnsConfig fields when provider is not set --- cluster/defaults.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cluster/defaults.go b/cluster/defaults.go index a673f890..0192e74c 100644 --- a/cluster/defaults.go +++ b/cluster/defaults.go @@ -489,7 +489,9 @@ func (c *Cluster) setClusterDNSDefaults() error { logrus.Debugf("Cluster version [%s] is less than version [%s], using DNS provider [%s]", clusterSemVer, K8sVersionCoreDNSSemVer, DefaultDNSProvider) ClusterDNSProvider = DefaultDNSProvider } - c.DNS = &v3.DNSConfig{} + if c.DNS == nil { + c.DNS = &v3.DNSConfig{} + } c.DNS.Provider = ClusterDNSProvider logrus.Debugf("DNS provider set to [%s]", ClusterDNSProvider) return nil