Merge pull request 'ozg-6647 add monitoring network policy' (#125) from...

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

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/user-manager/pulls/125


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

src/main/helm/templates/network_policy.yaml

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

src/test/helm/network_policy_test.yaml

@@ -86,6 +86,13 @@ tests:
               - podSelector: 
                   matchLabels:
                     component: alfa
+            - ports:
+              - port: 9002
+                protocol: TCP
+              from:
+              - namespaceSelector: 
+                  matchLabels:
+                    name: openshift-user-workload-monitoring
             egress:
             - to:
               - podSelector: 
@@ -181,6 +188,24 @@ tests:
                 matchLabels:
                   component: local-client
 
+  - it: should set monitoring namespace for monitoring scraper ingress rule
+    set: 
+      networkPolicy:
+        ssoPublicIp: 51.89.117.53/32
+        dnsServerNamespace: test-namespace-dns
+        monitoringNamespace: test-monitoring
+    asserts:
+      - contains:
+          path: spec.ingress
+          content:
+              ports:
+              - port: 9002
+                protocol: TCP
+              from:
+              - namespaceSelector: 
+                  matchLabels:
+                    name: test-monitoring
+
   - it: should add additionalEgressConfigLocal
     set:
       networkPolicy: