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

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

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/eingang-manager/pulls/170


Reviewed-by: OZG-Cloud Team <noreply@ozg-sh.de>

src/main/helm/templates/network_policy.yaml

@@ -38,6 +38,13 @@ spec:
   ingress:
   - ports:
     - port: 8080
+  - from:
+    - namespaceSelector:
+        matchLabels:
+          name: {{ (.Values.networkPolicy).monitoringNamespace | default "openshift-user-workload-monitoring" }}
+    ports:
+    - protocol: TCP
+      port: 8081
   egress:
   - to:
     - podSelector: 

src/test/helm/network_policy_test.yaml

@@ -70,6 +70,13 @@ tests:
             ingress:
             - ports:
               - port: 8080
+            - from:
+              - namespaceSelector:
+                  matchLabels:
+                    name: openshift-user-workload-monitoring
+              ports:
+              - protocol: TCP
+                port: 8081
             egress:
             - to:
               - podSelector: 
@@ -92,6 +99,23 @@ tests:
                 - port: 5353
                   protocol: TCP
 
+  - it: should set monitoring namespace
+    set:
+      networkPolicy:
+        dnsServerNamespace: test-dns-namespace
+        monitoringNamespace: test-monitoring
+    asserts:
+      - contains:
+          path: spec.ingress
+          content:
+            from:
+              - namespaceSelector:
+                  matchLabels:
+                    name: test-monitoring
+            ports:
+              - protocol: TCP
+                port: 8081
+
   - it: test network policy disabled
     set:
       networkPolicy: