MISC fix usage of tpl missing from some helm containers

inviqa · Dec 5, 2019 · e415bb2 · e415bb2
1 parent 66335dd
commit e415bb2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/helm/app/templates/application/app-init.yaml b/helm/app/templates/application/app-init.yaml
@@ -10,13 +10,23 @@ spec:
       containers:
       - env:
         {{- range $key, $value := index .Values.docker.services "php-base" "environment" }}
+        {{- $tp := typeOf $value }}
         - name: {{ $key | quote }}
+        {{- if eq $tp "string" }}
+          value: {{ tpl $value $ | quote }}
+        {{- else }}
           value: {{ $value | quote }}
         {{- end }}
+        {{- end }}
         {{- range $key, $value := .Values.docker.services.console.environment }}
+        {{- $tp := typeOf $value }}
         - name: {{ $key | quote }}
+        {{- if eq $tp "string" }}
+          value: {{ tpl $value $ | quote }}
+        {{- else }}
           value: {{ $value | quote }}
         {{- end }}
+        {{- end }}
         {{- range $key, $value := .Values.environment }}
         - name: {{ $key | quote }}
           value: {{ $value | quote }}

diff --git a/helm/app/templates/application/app-migrate.yaml b/helm/app/templates/application/app-migrate.yaml
@@ -11,13 +11,23 @@ spec:
       containers:
       - env:
         {{- range $key, $value := index .Values.docker.services "php-base" "environment" }}
+        {{- $tp := typeOf $value }}
         - name: {{ $key | quote }}
+        {{- if eq $tp "string" }}
+          value: {{ tpl $value $ | quote }}
+        {{- else }}
           value: {{ $value | quote }}
         {{- end }}
+        {{- end }}
         {{- range $key, $value := .Values.docker.services.console.environment }}
+        {{- $tp := typeOf $value }}
         - name: {{ $key | quote }}
+        {{- if eq $tp "string" }}
+          value: {{ tpl $value $ | quote }}
+        {{- else }}
           value: {{ $value | quote }}
         {{- end }}
+        {{- end }}
         {{- range $key, $value := .Values.environment }}
         - name: {{ $key | quote }}
           value: {{ $value | quote }}