Merge branch 'OZG-7023-OZG-6956-E2E-externe-Stellen' of...

Merge branch 'OZG-7023-OZG-6956-E2E-externe-Stellen' of git.ozg-sh.de:ozgcloud-app/alfa into OZG-7023-OZG-6956-E2E-externe-Stellen

src/main/helm/templates/_helpers.tpl

@@ -73,7 +73,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 {{- end -}}
 
-{{- define "app.grpc_client_vorgang_manager_address" -}}
+{{- define "app.grpcClientVorgangManagerAddress" -}}
 {{ printf "dns:///%s.%s:9090" ( coalesce .Values.vorgangManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end -}}
 
@@ -85,6 +85,14 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{ printf "dns:///%s.%s:9000" ( coalesce .Values.usermanagerName "user-manager" ) .Release.Namespace }}
 {{- end -}}
 
+{{- define "app.zufiNamespace" -}}
+{{ printf "%s" ( required "zufiManager.namespace must be set if zufiManager server is enabled" (.Values.zufiManager).namespace ) }}
+{{- end -}}
+
+{{- define "app.grpcClientZufiServerAddress" -}}
+{{ printf "dns:///%s.%s:9090" .Values.zufiManager.serverName (include "app.zufiNamespace" . ) }}
+{{- end -}}
+
 {{- define "app.grpc_client_collaboration-manager_address" -}}
 {{ printf "dns:///%s.%s:9090" ( coalesce .Values.collaborationManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end -}}

src/main/helm/templates/deployment.yaml

@@ -71,7 +71,7 @@ spec:
         - name: SERVICE_BINDING_ROOT
           value: "/bindings"
         - name: grpc_client_vorgang-manager_address
-          value: {{ include "app.grpc_client_vorgang_manager_address" . }}
+          value: {{ include "app.grpcClientVorgangManagerAddress" . }}
         - name: grpc_client_vorgang-manager_negotiationType
           value: {{ (.Values.vorgangManager).grpcClientNegotiationType | default "TLS" }}
         - name: grpc_client_user-manager_address
@@ -113,10 +113,12 @@ spec:
         {{- end}}
         - name: ozgcloud_administration_address
           value: {{ include "app.spring_cloud_config_administration_address" . }}
+{{- if ((.Values.ozgcloud).feature).collaborationEnabled }}
         - name: grpc_client_zufi-manager_address
-          value: {{ .Values.zufiManager.address }}
+          value: {{ include "app.grpcClientZufiServerAddress" . }}
         - name: grpc_client_zufi-manager_negotiationType
           value: {{ (.Values.zufiManager).grpcClientNegotiationType | default "TLS" }}
+{{- end }}
         {{- if ((.Values.ozgcloud).feature).collaborationEnabled }}
         - name: ozgcloud_feature_collaborationEnabled
           value: {{ ((.Values.ozgcloud).feature).collaborationEnabled | quote }}

src/main/helm/templates/network_policy.yaml

@@ -56,7 +56,7 @@ spec:
   - to:
     - namespaceSelector:
         matchLabels:
-          kubernetes.io/metadata.name: {{ required "zufiManager.namespace must be set if zufiManager server is enabled" (.Values.zufiManager).namespace }}
+          kubernetes.io/metadata.name: {{ include "app.zufiNamespace" . }}
       podSelector:
         matchLabels:
           component: zufi-server

src/main/helm/values.yaml

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

src/test/helm-linter-values.yaml

@@ -40,4 +40,4 @@ sso:
 imagePullSecret: image-pull-secret
 
 zufiManager:
-  address: https://url.url
+  namespace: namespace
\ No newline at end of file

src/test/helm/deployment_collaboration_env_test.yaml

@@ -39,18 +39,30 @@ set:
     serverUrl: https://sso.company.local
   imagePullSecret: image-pull-secret
 tests:
-  - it: should have set zufi server address
+  - it: should set zufi server address
     set:
       zufiManager:
-        address: url://url.url
+        namespace: namespace
+      ozgcloud:
+        feature:
+          collaborationEnabled: true
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: grpc_client_zufi-manager_address
-            value: url://url.url
+            value: dns:///zufi-server.namespace:9090
+  - it: should not set zufi server address
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_zufi-manager_address
+          any: true
   - it: should enable collaboration
     set:
+      zufiManager:
+        namespace: namespace
       ozgcloud:
         feature:
           collaborationEnabled: true
@@ -61,10 +73,6 @@ tests:
             name: ozgcloud_feature_collaborationEnabled
             value: "true"
   - it: should not enable collaboration
-    set:
-      ozgcloud:
-        feature:
-          collaborationEnabled: false
     asserts:
       - notContains:
           path: spec.template.spec.containers[0].env
@@ -74,7 +82,11 @@ tests:
   - it: should set negotiation type
     set:
       zufiManager:
+        namespace: namespace
         grpcClientNegotiationType: PLAINTEXT
+      ozgcloud:
+        feature:
+          collaborationEnabled: true
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -83,9 +95,21 @@ tests:
             value: PLAINTEXT
   - it: negotiation type is TLS in standard
     set:
+      zufiManager:
+        namespace: namespace
+      ozgcloud:
+        feature:
+          collaborationEnabled: true
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: grpc_client_zufi-manager_negotiationType
             value: TLS
+  - it: should not set negotiation type
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_zufi-manager_negotiationType
+          any: true