OZG-7573 add ingress for vorgang-manager

src/main/helm/templates/network_policy.yaml

@@ -22,12 +22,12 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-{{- if not (.Values.networkPolicy).disabled }} 
+{{- if not (.Values.networkPolicy).disabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   name: network-policy-{{ .Release.Name}}
-  namespace: {{ .Release.Namespace }} 
+  namespace: {{ .Release.Namespace }}
 spec:
   podSelector:
     matchLabels:
@@ -45,9 +45,19 @@ spec:
     ports:
     - protocol: TCP
       port: 8081
+  {{- if (.Values.forwarding).enabled }}
+  - ports:
+    - port: 9090
+      protocol: TCP
+    from:
+    - namespaceSelector: {}
+      podSelector:
+        matchLabels:
+          component: vorgang-manager
+  {{- end }}
   egress:
   - to:
-    - podSelector: 
+    - podSelector:
         matchLabels:
           component: vorgang-manager
     ports:
@@ -72,7 +82,7 @@ spec:
     - namespaceSelector:
         matchLabels:
           kubernetes.io/metadata.name: {{ required "routing.zufiManager.namespace must be set if routingStrategy=ZUFI" ((.Values.routing).zufiManager).namespace }}
-      podSelector: 
+      podSelector:
         matchLabels:
           component: zufi-server
     ports:
@@ -80,7 +90,7 @@ spec:
         protocol: TCP
   - to:
     - namespaceSelector: {}
-      podSelector: 
+      podSelector:
         matchLabels:
           component: vorgang-manager
     ports:
@@ -88,4 +98,4 @@ spec:
         protocol: TCP
 {{- end }}
 
-{{- end }} 
+{{- end }}
\ No newline at end of file

src/test/helm/network_policy_test.yaml

@@ -222,3 +222,42 @@ tests:
             ports:
               - port: 9090
                 protocol: TCP
+
+  - it: should add ingress from vorgang-manager if forwarding is enabled
+    set:
+      networkPolicy:
+        dnsServerNamespace: test-dns-server-namespace
+      forwarding:
+        enabled: true
+    asserts:
+      - contains:
+          path: spec.ingress
+          content:
+            from:
+              - namespaceSelector: {}
+                podSelector:
+                  matchLabels:
+                    component: vorgang-manager
+            ports:
+              - port: 9090
+                protocol: TCP
+
+  - it: should not add ingress from vorgang-manager if forwarding is disabled
+    set:
+      networkPolicy:
+        dnsServerNamespace: test-dns-server-namespace
+      forwarding:
+        enabled: false
+    asserts:
+      - notContains:
+          path: spec.ingress
+          content:
+            from:
+              - namespaceSelector: {}
+                podSelector:
+                  matchLabels:
+                    component: vorgang-manager
+            ports:
+              - port: 9090
+                protocol: TCP
+          any: true