Merge pull request 'OZG-6301: OZG-6504: Add negotiationtype' (#736) from...

Merge pull request 'OZG-6301: OZG-6504: Add negotiationtype' (#736) from OZG-6504-dns-url-zufi into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/alfa/pulls/736


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

src/main/helm/templates/deployment.yaml

@@ -111,6 +111,8 @@ spec:
           value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselVersion | quote }}
         - name: grpc_client_zufi-manager_address
           value: {{ .Values.zufiManager.address }}
+        - name: grpc_client_zufi-manager_negotiationType
+          value: {{ (.Values.zufiManager).grpcClientNegotiationType | default "TLS" }}
         {{- if ((.Values.ozgcloud).feature).collaborationEnabled }}
         - name: ozgcloud_feature_collaborationEnabled
           value: {{ ((.Values.ozgcloud).feature).collaborationEnabled | quote }}

src/test/helm/deployment_collaboration_env_test.yaml

@@ -46,3 +46,21 @@ tests:
           content:
             name: ozgcloud_feature_collaborationEnabled
           any: true
+  - it: should set negotiation type
+    set:
+      zufiManager:
+        grpcClientNegotiationType: PLAINTEXT
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_zufi-manager_negotiationType
+            value: PLAINTEXT
+  - it: negotiation type is TLS in standard
+    set:
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_zufi-manager_negotiationType
+            value: TLS
\ No newline at end of file