Uses correct default

kubernetes-sigs · Jun 4, 2020 · dd7748c · dd7748c
1 parent 09e25a0
commit dd7748c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/localnodedns/config/samples/addons_v1alpha1_localnodedns.yaml b/localnodedns/config/samples/addons_v1alpha1_localnodedns.yaml
@@ -4,6 +4,4 @@ metadata:
   name: localnodedns-sample
   namespace: kube-system
 spec:
-  clusterIP: 10.96.0.10
-  dnsDomain: cluster.local
-  dnsIP: 169.254.20.10
+  channel: stable
diff --git a/localnodedns/controllers/localnodedns_controller.go b/localnodedns/controllers/localnodedns_controller.go
@@ -79,17 +79,21 @@ func (r *LocalNodeDNSReconciler) SetupWithManager(mgr ctrl.Manager) error {
 func replaceVariables(ctx context.Context, object declarative.DeclarativeObject, s string) (string, error) {
 	o := object.(*api.LocalNodeDNS)
 
-	if o.Spec.DNSDomain != "" {
-		s = strings.Replace(s, "__PILLAR__DNS__DOMAIN__", o.Spec.DNSDomain, -1)
+	if o.Spec.DNSDomain == "" {
+		o.Spec.DNSDomain = "cluster.local"
 	}
 
-	if o.Spec.DNSIP != "" {
-		s = strings.Replace(s, "__PILLAR__LOCAL__DNS__", o.Spec.DNSIP, -1)
+	if o.Spec.DNSIP == "" {
+		o.Spec.DNSIP = "169.254.20.10"
 	}
 
-	if o.Spec.ClusterIP != "" {
-		s = strings.Replace(s, "__PILLAR__DNS__SERVER__", o.Spec.ClusterIP, -1)
+	if o.Spec.ClusterIP == "" {
+		o.Spec.ClusterIP = "10.96.0.10"
 	}
 
+	s = strings.Replace(s, "__PILLAR__LOCAL__DNS__", o.Spec.DNSIP, -1)
+	s = strings.Replace(s, "__PILLAR__DNS__SERVER__", o.Spec.ClusterIP, -1)
+	s = strings.Replace(s, "__PILLAR__DNS__DOMAIN__", o.Spec.DNSDomain, -1)
+
 	return s, nil
 }