OZG-6515 refactor zufi namespace in helm charts

src/main/helm/templates/_helpers.tpl

@@ -57,6 +57,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.grpc_client_zufi-server_address" -}}
+{{ printf "dns:///%s.%s:9090" .Values.zufiManager.serverName (include "app.zufiNamespace" . ) }}
+{{- end -}}
+
 {{- define "app.spring_cloud_config_administration_address" -}}
 {{ printf "http://%s.%s:8080" ( coalesce .Values.administrationName "administration" ) .Release.Namespace }}
 {{- end -}}

src/main/helm/templates/deployment.yaml

@@ -111,10 +111,12 @@ spec:
           value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselVersion | quote }}
         - 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.grpc_client_zufi-server_address" . }}
         - 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

@@ -32,10 +32,10 @@ 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
+          component: {{ .Values.zufiManager.serverName }}
     ports:
       - port: 9090
         protocol: TCP

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

@@ -39,4 +39,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

@@ -14,18 +14,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
@@ -36,10 +48,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
@@ -49,7 +57,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
@@ -58,9 +70,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