Merge pull request #13 from wzshiming/fix/template-yaml

Fix template yaml function
wzshiming · Apr 16, 2022 · 76c091f · 76c091f
2 parents 608c298 + 565e52a
commit 76c091f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/cmd/fake-kubelet/node.initialization.tpl b/cmd/fake-kubelet/node.initialization.tpl
@@ -1,30 +1,30 @@
 {{ with .status }}
 addresses:
 {{ with .addresses }}
-{{ . | YAML }}
+{{ YAML . 1 }}
 {{ else }}
 - address: {{ NodeIP }}
   type: InternalIP
 {{ end }}
 allocatable:
 {{ with .allocatable }}
-{{ . | YAML }}
+{{ YAML . 1 }}
 {{ else }}
   cpu: 1k
   memory: 1Ti
   pods: 1M
 {{ end }}
 capacity:
 {{ with .capacity }}
-{{ . | YAML }}
+{{ YAML . 1 }}
 {{ else }}
   cpu: 1k
   memory: 1Ti
   pods: 1M
 {{ end }}
 daemonEndpoints:
 {{ with .daemonEndpoints }}
-{{ . | YAML }}
+{{ YAML . 1 }}
 {{ else }}
   kubeletEndpoint:
     Port: 0

diff --git a/controller.go b/controller.go
@@ -98,12 +98,17 @@ func NewController(conf Config) (*Controller, error) {
 		"PodIP": func() string {
 			return n.ipPool.Get()
 		},
-		"YAML": func(s interface{}) (string, error) {
+		"YAML": func(s interface{}, indent ...int) (string, error) {
 			d, err := yaml.Marshal(s)
 			if err != nil {
 				return "", err
 			}
-			return string(d), nil
+
+			data := string(d)
+			if len(indent) == 1 && indent[0] > 0 {
+				data = strings.Replace("\n"+data, "\n", "\n"+strings.Repeat("  ", indent[0]), -1)
+			}
+			return data, nil
 		},
 	}
 	return n, nil

diff --git a/deploy.yaml b/deploy.yaml
@@ -180,30 +180,30 @@ data:
     {{ with .status }}
     addresses:
     {{ with .addresses }}
-    {{ . | YAML }}
+    {{ YAML . 1 }}
     {{ else }}
     - address: {{ NodeIP }}
       type: InternalIP
     {{ end }}
     allocatable:
     {{ with .allocatable }}
-    {{ . | YAML }}
+    {{ YAML . 1 }}
     {{ else }}
       cpu: 1k
       memory: 1Ti
       pods: 1M
     {{ end }}
     capacity:
     {{ with .capacity }}
-    {{ . | YAML }}
+    {{ YAML . 1 }}
     {{ else }}
       cpu: 1k
       memory: 1Ti
       pods: 1M
     {{ end }}
     daemonEndpoints:
     {{ with .daemonEndpoints }}
-    {{ . | YAML }}
+    {{ YAML . 1 }}
     {{ else }}
       kubeletEndpoint:
         Port: 0