Merge pull request #89 from mnottale/helm-fix

helm: Fix rendering by prepending 'Values' to variables.

Author: mnottale

e2e/testdata/helm-expected.chart/templates/stack.yaml

@@ -19,40 +19,40 @@ metadata:
   uid: ""
 spec:
   services:
-  - image: '{{.watcher.image}}'
+  - image: '{{.Values.watcher.image}}'
     name: app-watcher
   - deploy:
       resources:
         limits:
-          memory: '{{.memory}}'
+          memory: '{{.Values.memory}}'
     health_check:
       interval: 2m0s
       test:
       - /ping
       - debug
-      timeout: '{{.timeout}}'
+      timeout: '{{.Values.timeout}}'
     image: busybox:latest
     name: debug
     ports:
     - mode: ingress
       protocol: tcp
-      target: '{{.aport}}'
+      target: '{{.Values.aport}}'
     - mode: ingress
       protocol: tcp
-      published: '{{.dport}}'
-      target: '{{.sport}}'
-    privileged: '{{.privileged}}'
-    read_only: '{{.read_only}}'
-    stdin_open: '{{.stdin_open}}'
-    tty: '{{.tty}}'
+      published: '{{.Values.dport}}'
+      target: '{{.Values.sport}}'
+    privileged: '{{.Values.privileged}}'
+    read_only: '{{.Values.read_only}}'
+    stdin_open: '{{.Values.stdin_open}}'
+    tty: '{{.Values.tty}}'
   - deploy:
-      replicas: '{{.myapp.nginx_replicas}}'
-    image: nginx:{{.myapp.nginx_version}}
+      replicas: '{{.Values.myapp.nginx_replicas}}'
+    image: nginx:{{.Values.myapp.nginx_version}}
     name: front
   - command:
     - monitor
     - --source
-    - '{{.app.name}}-{{.app.version}}'
+    - '{{.Values.app.name}}-{{.Values.app.version}}'
     - $dollar
     image: busybox:latest
     name: monitor

renderer/helm.go

@@ -100,7 +100,7 @@ func filterVariables(settings map[string]interface{}, variables []string, prefix
 // toGoTemplate converts $foo and ${foo} into {{.foo}}
 func toGoTemplate(template string) (string, error) {
 	re := regexp.MustCompile(`(^|[^$])\${?([a-zA-Z0-9_.]+)}?`)
-	template = re.ReplaceAllString(template, "$1{{.$2}}")
+	template = re.ReplaceAllString(template, "$1{{.Values.$2}}")
 	template = strings.Replace(template, "$$", "$", -1)
 	return template, nil
 }