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

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

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/zufi-manager/pulls/85


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

src/main/helm/zufi-server/templates/network_policy.yaml

@@ -59,7 +59,13 @@ spec:
       podSelector: 
         matchLabels:
           component: fachstellen-proxy
-      
+  - 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/zufi-server/network_policy_test.yaml

@@ -112,6 +112,13 @@ tests:
                         component: fachstellen-proxy
                 ports:
                   - port: 9090
+              - from:
+                  - namespaceSelector:
+                      matchLabels:
+                        name: openshift-user-workload-monitoring
+                ports:
+                  - protocol: TCP
+                    port: 8081
             podSelector:
               matchLabels:
                 component: zufi-server
@@ -119,8 +126,23 @@ tests:
               - Ingress
               - Egress
 
-           
-
+  - it: should set monitoring namespace
+    set:
+      networkPolicy:
+        dnsServerNamespace: test-ns
+        fachstellenProxyNamespace: fachstellen-proxy
+        monitoringNamespace: test-monitoring
+    asserts:
+      - contains:
+          path: spec.ingress
+          content:
+            from:
+              - namespaceSelector:
+                  matchLabels:
+                    name: test-monitoring
+            ports:
+              - protocol: TCP
+                port: 8081
 
   - it: add ingress rule by values local
     set: