diff --git a/pom.xml b/pom.xml
index 33036c5bf2f34fc04262a1502f0622f9064c253c..a6d1bf960246376f53579bfefcbedd75a771d9d8 100644
--- a/pom.xml
+++ b/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>
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index a363708685d45fd0498a5ee835b973885652f397..b8750949572c54207885c21dc488aca7fb0b7b58 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/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:
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 6c44bc57d82252778700b3c5d12c74d8e3c27426..a9130a41e6164e82f5f94df7a3a64e2ffb5dc65d 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -68,4 +68,6 @@ ozgcloud:
enabled: false
elsterTransfer:
name: elster-transfer
- namespace:
\ No newline at end of file
+ namespace:
+ aggregationManager:
+ enabled: false
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index 822d03a39c39b49bdd3cb888b32d4b259b5eec7d..17c7a47611643bec68e2d54f90ccfbc74b4954be 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -731,4 +731,38 @@ tests:
namespaceSelector:
matchLabels:
kubernetes.io/metadata.name: elster-transfer
- any: true
\ No newline at end of file
+ any: true
+ - 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
diff --git a/vorgang-manager-base/pom.xml b/vorgang-manager-base/pom.xml
index c9b2cad204b86d3112084bce8f18f531376c9445..c204bce899ad05d7a4c3a757c2f656bfac85d31d 100644
--- a/vorgang-manager-base/pom.xml
+++ b/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>
diff --git a/vorgang-manager-command/pom.xml b/vorgang-manager-command/pom.xml
index c6aaed08d4ea888ca321324fc140d08b0219c392..5dda776d5d776d63b32b6319a611ef822f165fa9 100644
--- a/vorgang-manager-command/pom.xml
+++ b/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>
diff --git a/vorgang-manager-interface/pom.xml b/vorgang-manager-interface/pom.xml
index 47a0cf132e6aacbadcfc9cd60290abd6bc87fe36..69f5c245ada6f8accd0fd87e76a07d8af6eee522 100644
--- a/vorgang-manager-interface/pom.xml
+++ b/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>
diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml
index a73ec95fe6fad3f68b9cb2b995a87b900126a6d0..4e13b200987e7cfdba9230a683f6ebb6f1b7d724 100644
--- a/vorgang-manager-server/pom.xml
+++ b/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>
diff --git a/vorgang-manager-utils/pom.xml b/vorgang-manager-utils/pom.xml
index 4fb4b408696d4388bf22fe7fc6dc32c127ac4e2d..619ddbee2ee2393abb2625f561f5dde655d70206 100644
--- a/vorgang-manager-utils/pom.xml
+++ b/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>