Merge pull request 'OZG-5958 add customVars for xta-adapter' (#135) from OZG-5958 into master

xta-adapter/src/main/helm/templates/_helpers.tpl

@@ -59,3 +59,21 @@ helm.sh/chart: {{ include "app.chart" . }}
 {{- define "app.serviceAccountName" -}}
 {{ printf "%s" ( (.Values.serviceAccount).name | default "xta-adapter-service-account" ) }}
 {{- end -}}
+
+{{- define "app.getCustomList" -}}
+{{- with (.Values.env).customList -}}
+{{- if kindIs "map" . -}}
+{{ include "app.dictToList" . }}
+{{- else if kindIs "slice" . -}}
+{{ . | toYaml }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "app.dictToList" -}}
+{{- $customList := list -}}
+{{- range $key, $value := . -}}
+{{- $customList = append $customList (dict "name" $key "value" $value) }}
+{{- end -}}
+{{- $customList | toYaml -}}
+{{- end -}}
\ No newline at end of file

xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml

@@ -85,6 +85,9 @@ spec:
                 - name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName }}_negotiationType
                   value: {{ (.Values.routing).negotiationType | default "PLAINTEXT" }}
                 {{- end }}
+                {{- with include "app.getCustomList" . }}
+{{ . | indent 16 }}
+                {{- end }}
               volumeMounts:
                 - name: bindings
                   mountPath: "/bindings/ca-certificates/type"

xta-adapter/src/test/helm/network_policy_test.yaml

@@ -122,7 +122,6 @@ tests:
           - ipBlock:
               cidr: 1.2.3.4/32
 
-
   - it: test network policy disabled
     set:
       networkPolicy:

xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml

@@ -155,3 +155,45 @@ tests:
           content:
             name: grpc_client_vorgang-manager-vorgang-manager_negotiationType
             value: "TLS"
+  - it: check customList as list
+    set:
+      env.customList:
+        - name: my_test_environment_name
+          value: "A test value"
+        - name: test_environment
+          value: "B test value"
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].env
+          content:
+            name: my_test_environment_name
+            value: "A test value"
+      - contains:
+          path: spec.jobTemplate.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.jobTemplate.spec.template.spec.containers[0].env
+          content:
+            name: my_test_environment_name
+            value: "A test value"
+      - contains:
+          path: spec.jobTemplate.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:
+          path: spec.jobTemplate.spec.template.spec.containers[0].env
+          content:
+            name: my_test_environment_name
+            value: "A test value"
\ No newline at end of file