Merge pull request 'OZG-6301: OZG-6504: Add Zufi URL as it was done in...

Merge pull request 'OZG-6301: OZG-6504: Add Zufi URL as it was done in vorgang-manager as default value. Independent of collaborationEnabled-Feature.' (#731) from OZG-6504-configure-zufi into master

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


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

src/main/helm/templates/deployment.yaml

@@ -109,6 +109,8 @@ spec:
           value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselUri}}
         - name: ozgcloud_xdomea_behoerdenschluesselVersion
           value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselVersion | quote }}
+        - name: grpc_client_zufi-manager_address
+          value: {{ .Values.zufiManager.address }}
         {{- if ((.Values.ozgcloud).feature).collaborationEnabled }}
         - name: ozgcloud_feature_collaborationEnabled
           value: {{ ((.Values.ozgcloud).feature).collaborationEnabled | quote }}

src/main/helm/values.yaml

@@ -31,7 +31,8 @@ replicaCount: 2 # [default: 2]
 
 usermanagerName: user-manager
 
-
+zufiManager:
+  address: dns://zufi-server.zufi:9090
 
 # env:
 #   overrideSpringProfiles: "oc,prod"

src/test/helm-linter-values.yaml

@@ -37,3 +37,6 @@ sso:
   serverUrl: https://sso.company.local
 
 imagePullSecret: image-pull-secret
+
+zufiManager:
+  address: https://url.url
\ No newline at end of file

src/test/helm/deployment_collaboration_env_test.yaml

@@ -14,6 +14,16 @@ set:
     serverUrl: https://sso.company.local
   imagePullSecret: image-pull-secret
 tests:
+  - it: should have set zufi server address
+    set:
+      zufiManager:
+        address: url://url.url
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_zufi-manager_address
+            value: url://url.url
   - it: should enable collaboration
     set:
       ozgcloud: