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

dominicgunn · web-flow · commit ae2f65a264ab · 2020-07-02T15:23:19.000+01:00
Add proper indentation to additional zone CoreDNS config
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

Original file line number	Diff line number	Diff line change
`@@ -3905,7 +3905,7 @@ write_files:`
`3905`	`3905`	`loadbalance`
`3906`	`3906`	`}`
`3907`	`3907`	`{{- if and (eq .KubeDns.Provider "coredns") .KubeDns.AdditionalZoneCoreDNSConfig }}`
`3908`		`- {{ .KubeDns.AdditionalZoneCoreDNSConfig }}`
	`3908`	`+{{ .KubeDns.AdditionalZoneCoreDNSConfig \| indent 12 }}`
`3909`	`3909`	`{{- end }}`
`3910`	`3910`	`{{- else }}`
`3911`	`3911`	`- path: /srv/kubernetes/manifests/kube-dns-sa.yaml`