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

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

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/alfa/pulls/757


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

src/main/helm/templates/network_policy.yaml

@@ -14,6 +14,13 @@ spec:
   ingress:
   - ports:
     - port: 8080
+  - from:
+    - namespaceSelector:
+        matchLabels:
+          name: {{ (.Values.networkPolicy).monitoringNamespace | default "openshift-user-workload-monitoring" }}
+    ports:
+    - protocol: TCP
+      port: 8081
 {{- with (.Values.networkPolicy).additionalIngressConfigLocal }}
 {{ toYaml . | indent 2 }}
 {{- end }}

src/test/helm/network_policy_test.yaml

@@ -76,6 +76,13 @@ tests:
             ingress:
             - ports:
               - port: 8080
+            - from:
+              - namespaceSelector:
+                  matchLabels:
+                    name: openshift-user-workload-monitoring
+              ports:
+                - port: 8081
+                  protocol: TCP
             egress:
             - to:
               - podSelector:
@@ -260,3 +267,20 @@ tests:
     asserts:
       - failedTemplate:
           errorMessage: zufiManager.namespace must be set if zufiManager server is enabled
+  - it: should set monitoring namesapce
+    set:
+      networkPolicy:
+        ssoPublicIp: 1.1.1.1
+        dnsServerNamespace: test-dns-server-namespace
+        monitoringNamespace: test-monitoring
+    asserts:
+      - contains:
+          path: spec.ingress
+          content:
+            from:
+              - namespaceSelector:
+                  matchLabels:
+                    name: test-monitoring
+            ports:
+              - protocol: TCP
+                port: 8081
\ No newline at end of file