Merge branch 'ozg-3322-enable-mongodb-tls' into ozg-3938-enable-grpc-tls

src/main/helm/templates/_helpers.tpl

@@ -158,8 +158,9 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.dictToList" -}}
+{{- $customList := list -}}
 {{- range $key, $value := . -}}
-- name: {{ $key }}
-  value: {{ $value }}
+{{- $customList = append $customList (dict "name" $key "value" $value) }}
 {{- end -}}
+{{- $customList | toYaml -}}
 {{- end -}}
\ No newline at end of file

src/test/helm/deployment_env_test.yaml

@@ -40,22 +40,35 @@ tests:
       env.customList:
         - name: my_test_environment_name
           value: "A test value"
+        - name: test_environment
+          value: "B test value"
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: my_test_environment_name
             value: "A test value"
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: test_environment
+            value: "B test value"
   - it: check customList as dict
     set:
       env.customList:
         my_test_environment_name: "A test value"
+        test_environment: "B test value"
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: my_test_environment_name
             value: "A test value"
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: test_environment
+            value: "B test value"
   - it: check customList test value is not set by default
     asserts:
       - notContains: