Merge pull request #1877 from kfr2/indent-KubeDns.AdditionalZoneCoreD…

…NSConfig Add proper indentation to additional zone CoreDNS config
kubernetes-retired · Jul 2, 2020 · ae2f65a · ae2f65a
2 parents cd68fa8 + 6d5ccb2
commit ae2f65a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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