Merge pull request 'ozg-6647-network-policy-for-scraper' (#443) from...

Merge pull request 'ozg-6647-network-policy-for-scraper' (#443) from ozg-6647-network-policy-for-scraper into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/vorgang-manager/pulls/443


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

src/main/helm/templates/network_policy.yaml

@@ -48,6 +48,13 @@ spec:
     - podSelector:
         matchLabels:
           ozg-component: xta-adapter
+  - from:
+    - namespaceSelector:
+        matchLabels:
+          name: {{ (.Values.networkPolicy).monitoringNamespace | default "openshift-user-workload-monitoring" }}
+    ports:
+    - protocol: TCP
+      port: 8081
 {{- if ((.Values.ozgcloud).antragraum).enabled }}
   - from:
     - namespaceSelector:

src/test/helm/network_policy_test.yaml

@@ -107,6 +107,40 @@ tests:
                       matchLabels:
                         ozg-component: xta-adapter
 
+  - it: should add ingress rule for monitoring scraper
+    set: 
+      networkPolicy:
+        dnsServerNamespace: test-dns-namespace
+    asserts:
+      - contains:
+          path: spec.ingress
+          content:
+              ports:
+              - port: 8081
+                protocol: TCP
+              from:
+              - namespaceSelector: 
+                  matchLabels:
+                    name: openshift-user-workload-monitoring
+
+  - it: should set monitoring namespace for monitoring scraper ingress rule
+    set: 
+      networkPolicy:
+        dnsServerNamespace: test-dns-namespace
+        monitoringNamespace: test-monitoring
+    asserts:
+      - contains:
+          path: spec.ingress
+          content:
+              ports:
+              - port: 8081
+                protocol: TCP
+              from:
+              - namespaceSelector: 
+                  matchLabels:
+                    name: test-monitoring
+
+
   - it: should add ingress rule for antragraum if antragraum is enabled
     set:
       networkPolicy: