Merge pull request #9376 from justinsb/nodelocaldns_small_tweaks

NodeLocalDNS config population: small tweaks
kubernetes · Jun 16, 2020 · b453209 · b453209
2 parents 97181b9 + 74c787b
commit b453209
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/pkg/model/components/kubedns.go b/pkg/model/components/kubedns.go
@@ -75,12 +75,16 @@ func (b *KubeDnsOptionsBuilder) BuildOptions(o interface{}) error {
 		clusterSpec.KubeDNS.MemoryLimit = &defaultMemoryLimit
 	}
 
-	NodeLocalDNS := clusterSpec.KubeDNS.NodeLocalDNS
-	if NodeLocalDNS == nil {
-		NodeLocalDNS = &kops.NodeLocalDNSConfig{}
-		NodeLocalDNS.Enabled = fi.Bool(false)
-	} else if fi.BoolValue(NodeLocalDNS.Enabled) && NodeLocalDNS.LocalIP == "" {
-		NodeLocalDNS.LocalIP = "169.254.20.10"
+	nodeLocalDNS := clusterSpec.KubeDNS.NodeLocalDNS
+	if nodeLocalDNS == nil {
+		nodeLocalDNS = &kops.NodeLocalDNSConfig{}
+		clusterSpec.KubeDNS.NodeLocalDNS = nodeLocalDNS
+	}
+	if nodeLocalDNS.Enabled == nil {
+		nodeLocalDNS.Enabled = fi.Bool(false)
+	}
+	if fi.BoolValue(nodeLocalDNS.Enabled) && nodeLocalDNS.LocalIP == "" {
+		nodeLocalDNS.LocalIP = "169.254.20.10"
 	}
 
 	return nil