Merge pull request #7979 from rochacon/fix-ext-core-file-indent

Add indent template function and use it to fix KubeDNS.ExternalCoreFile rendering
kubernetes · Nov 23, 2019 · 33089f9 · 33089f9
2 parents d87fcf1 + 9b0d0aa
commit 33089f9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
@@ -60,7 +60,7 @@ metadata:
 data:
   Corefile: |
   {{- if KubeDNS.ExternalCoreFile }}
-    {{ KubeDNS.ExternalCoreFile }}
+{{ KubeDNS.ExternalCoreFile | indent 4 }}
   {{- else }}
     .:53 {
         errors

diff --git a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.6.yaml.template
@@ -60,7 +60,7 @@ metadata:
 data:
   Corefile: |
   {{- if KubeDNS.ExternalCoreFile }}
-    {{ KubeDNS.ExternalCoreFile }}
+{{ KubeDNS.ExternalCoreFile | indent 4 }}
   {{- else }}
     .:53 {
         errors

diff --git a/upup/pkg/fi/cloudup/BUILD.bazel b/upup/pkg/fi/cloudup/BUILD.bazel
@@ -83,6 +83,7 @@ go_library(
         "//util/pkg/hashing:go_default_library",
         "//util/pkg/reflectutils:go_default_library",
         "//util/pkg/vfs:go_default_library",
+        "//vendor/github.com/Masterminds/sprig:go_default_library",
         "//vendor/github.com/blang/semver:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go
@@ -35,6 +35,7 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/Masterminds/sprig"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog"
@@ -78,6 +79,9 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
 		return strings.Join(a, sep)
 	}
 
+	sprigTxtFuncMap := sprig.TxtFuncMap()
+	dest["indent"] = sprigTxtFuncMap["indent"]
+
 	dest["ClusterName"] = tf.modelContext.ClusterName
 	dest["HasTag"] = tf.HasTag
 	dest["WithDefaultBool"] = func(v *bool, defaultValue bool) bool {