pom.xml

@@ -31,7 +31,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.ozgcloud.vorgang</groupId>
 	<artifactId>vorgang-manager</artifactId>
-	<version>2.23.0-SNAPSHOT</version>
+	<version>2.24.0-SNAPSHOT</version>
 
 	<name>OZG-Cloud Vorgang Manager</name>
 	<packaging>pom</packaging>

src/main/helm/templates/network_policy.yaml

@@ -48,6 +48,15 @@ spec:
     - podSelector:
         matchLabels:
           ozg-component: xta-adapter
+{{- if ((.Values.ozgcloud).aggregationManager).enabled }}
+  - from:
+    - podSelector: 
+        matchLabels:
+          component: aggregation-manager
+    ports:
+    - protocol: TCP
+      port: 9090
+{{- end }}
   - from:
     - namespaceSelector:
         matchLabels:

src/main/helm/values.yaml

@@ -62,3 +62,7 @@ elasticsearch:
 
 networkPolicy:
   zentralerEingangNamespace: zentraler-eingang
+
+ozgcloud:
+  aggregationManager:
+    enabled: false
\ No newline at end of file

src/test/helm/network_policy_test.yaml

@@ -650,3 +650,38 @@ tests:
     asserts:
       - hasDocuments:
           count: 1
+
+  - it: should add ingress rule for aggregation-manager
+    set: 
+      networkPolicy:
+        dnsServerNamespace: test-dns-namespace
+      ozgcloud:
+        aggregationManager:
+          enabled: true
+    asserts:
+      - contains:
+          path: spec.ingress
+          content:
+              ports:
+              - port: 9090
+                protocol: TCP
+              from:
+              - podSelector: 
+                  matchLabels:
+                    component: aggregation-manager
+
+  - it: should not add ingress rule for aggregation-manager
+    set: 
+      networkPolicy:
+        dnsServerNamespace: test-dns-namespace
+    asserts:
+      - notContains:
+          path: spec.ingress
+          content:
+              ports:
+              - port: 9090
+                protocol: TCP
+              from:
+              - podSelector: 
+                  matchLabels:
+                    component: aggregation-manager

vorgang-manager-base/pom.xml

@@ -31,13 +31,13 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>4.11.0-SNAPSHOT</version>
+		<version>4.11.0</version>
 		<relativePath />
 	</parent>
 
 	<groupId>de.ozgcloud.vorgang</groupId>
 	<artifactId>vorgang-manager-base</artifactId>
-	<version>2.23.0-SNAPSHOT</version>
+	<version>2.24.0-SNAPSHOT</version>
 
 	<name>OZG-Cloud Vorgang Manager Base</name>
 	<inceptionYear>2020</inceptionYear>

vorgang-manager-command/pom.xml

@@ -31,13 +31,13 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>4.11.0-SNAPSHOT</version>
+		<version>4.11.0</version>
 		<relativePath />
 	</parent>
 
 	<groupId>de.ozgcloud.command</groupId>
 	<artifactId>command-manager</artifactId>
-	<version>2.23.0-SNAPSHOT</version>
+	<version>2.24.0-SNAPSHOT</version>
 	<name>OZG-Cloud Command Manager</name>
 	<inceptionYear>2020</inceptionYear>
 

vorgang-manager-interface/pom.xml

@@ -32,13 +32,13 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>4.11.0-SNAPSHOT</version>
+		<version>4.11.0</version>
 		<relativePath />
 	</parent>
 
 	<groupId>de.ozgcloud.vorgang</groupId>
 	<artifactId>vorgang-manager-interface</artifactId>
-	<version>2.23.0-SNAPSHOT</version>
+	<version>2.24.0-SNAPSHOT</version>
 
 	<name>OZG-Cloud Vorgang Manager gRPC Interface</name>
 	<description>Interface (gRPC) for Vorgang Manager Server</description>

vorgang-manager-server/pom.xml

@@ -32,13 +32,13 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>4.11.0-SNAPSHOT</version>
+		<version>4.11.0</version>
 		<relativePath />
 	</parent>
 
 	<groupId>de.ozgcloud.vorgang</groupId>
 	<artifactId>vorgang-manager-server</artifactId>
-	<version>2.23.0-SNAPSHOT</version>
+	<version>2.24.0-SNAPSHOT</version>
 
 	<name>OZG-Cloud Vorgang Manager Server</name>
 	<description>Server Implementierung des VorgangManagers</description>
@@ -54,7 +54,7 @@
 
 		<user-manager-interface.version>2.12.0</user-manager-interface.version>
 		<processor-manager.version>0.5.0</processor-manager.version>
-		<nachrichten-manager.version>2.18.0-SNAPSHOT</nachrichten-manager.version>
+		<nachrichten-manager.version>2.18.0</nachrichten-manager.version>
 		<api-lib.version>0.16.0</api-lib.version>
 		<notification-manager.version>2.15.0</notification-manager.version>
 		<collaboration-manager.version>0.7.0</collaboration-manager.version>

vorgang-manager-utils/pom.xml

@@ -32,14 +32,14 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>4.11.0-SNAPSHOT</version>
+		<version>4.11.0</version>
 		<relativePath />
 	</parent>
 
 	<groupId>de.ozgcloud.vorgang</groupId>
 	<artifactId>vorgang-manager-utils</artifactId>
 	<name>OZG-Cloud Vorgang Manager Utils</name>
-	<version>2.23.0-SNAPSHOT</version>
+	<version>2.24.0-SNAPSHOT</version>
 	<inceptionYear>2020</inceptionYear>
 
 	<properties>