From 6d5ccb29d73056cf3f4f0bfa5dae777d52f6871c Mon Sep 17 00:00:00 2001
From: Kevin Richardson <kevin@kevinrichardson.co>
Date: Wed, 1 Jul 2020 09:59:31 -0400
Subject: [PATCH] Add proper indentation to additional zone CoreDNS config

---
 builtin/files/cluster.yaml.tmpl                | 1 +
 builtin/files/userdata/cloud-config-controller | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/builtin/files/cluster.yaml.tmpl b/builtin/files/cluster.yaml.tmpl
index eb3cec6f0..6d5e3517a 100644
--- a/builtin/files/cluster.yaml.tmpl
+++ b/builtin/files/cluster.yaml.tmpl
@@ -1378,6 +1378,7 @@ kubeDns:
   # Allows addition of extra configuration into CoreDNS config map's root zone.
   # extraCoreDNSConfig: |
   #   rewrite name substring demo.app.org app.default.svc.cluster.local
+  #
   # This configuration is injected into the CoreDNS config map after the root
   # zone (".") and can be used to add configuration for additional zones.
   # additionalZoneCoreDNSConfig: |
diff --git a/builtin/files/userdata/cloud-config-controller b/builtin/files/userdata/cloud-config-controller
index 4f0da127f..f45ebc3d8 100644
--- a/builtin/files/userdata/cloud-config-controller
+++ b/builtin/files/userdata/cloud-config-controller
@@ -3905,7 +3905,7 @@ write_files:
                 loadbalance
             }
             {{- if and (eq .KubeDns.Provider "coredns") .KubeDns.AdditionalZoneCoreDNSConfig }}
-            {{ .KubeDns.AdditionalZoneCoreDNSConfig }}
+{{ .KubeDns.AdditionalZoneCoreDNSConfig | indent 12 }}
             {{- end }}
 {{- else }}
   - path: /srv/kubernetes/manifests/kube-dns-sa.yaml