rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-07-17 08:51:11 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1962 from mrajashree/dnsProvider

Browse Source 
Retain user-configured dnsConfig fields when provider is not set
This commit is contained in:
Rajashree Mandaogane 2020-03-13 09:12:17 -07:00 committed by GitHub
commit cc20cb7608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/defaults.go
View File

@ -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) logrus.Debugf("Cluster version [%s] is less than version [%s], using DNS provider [%s]", clusterSemVer, K8sVersionCoreDNSSemVer, DefaultDNSProvider)
ClusterDNSProvider = DefaultDNSProvider ClusterDNSProvider = DefaultDNSProvider
} }
c.DNS = &v3.DNSConfig{} if c.DNS == nil {
c.DNS = &v3.DNSConfig{}
}
c.DNS.Provider = ClusterDNSProvider c.DNS.Provider = ClusterDNSProvider
logrus.Debugf("DNS provider set to [%s]", ClusterDNSProvider) logrus.Debugf("DNS provider set to [%s]", ClusterDNSProvider)
return nil return nil