Merge branch 'OZG-7811-landesebene-helm' into 'main'

Ozg 7811 landesebene helm

See merge request !24

aggregation-manager-job/src/main/helm/templates/_helpers.tpl

@@ -79,8 +79,8 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.grpcClientVorgangManagerAddress" -}}
-{{- if (.Values.env).grpcClientVorgangManagerAddress -}}
-{{ printf "%s" (.Values.env).grpcClientVorgangManagerAddress }}
+{{- if ((.Values.ozgcloud).vorgangManager).address -}}
+{{ printf "%s" ((.Values.ozgcloud).vorgangManager).address }}
 {{- else -}}
 {{ printf "dns:///%s.%s:9090" ( coalesce .Values.vorgangManagerName "vorgang-manager" ) (include "app.namespace" . ) }}
 {{- end -}}

aggregation-manager-job/src/main/helm/templates/cronjob.yaml

@@ -62,7 +62,13 @@ spec:
               - name: grpc_client_vorgang-manager_address
                 value: {{ include "app.grpcClientVorgangManagerAddress" . }}
               - name: grpc_client_vorgang-manager_negotiationType
-                value: {{ (.Values.vorgangManager).grpcClientNegotiationType }}
+                value: {{ ((.Values.ozgcloud).vorgangManager).negotiationType }}
+              {{- if ((.Values.ozgcloud).aggregationManagerServer).address }}
+              - name: grpc_client_aggregation-manager-server_address
+                value: {{ ((.Values.ozgcloud).aggregationManagerServer).address }}
+              - name: grpc_client_aggregation-manager-server_negotiationType
+                value: {{ ((.Values.ozgcloud).aggregationManagerServer).negotiationType | default "TLS" }}
+              {{- end }}
               {{- if not (.Values.database).useExternal }}
               - name: spring_data_mongodb_uri
                 valueFrom:
@@ -75,6 +81,8 @@ spec:
               - name: ozgcloud_administration_address
                 value: {{ include "app.getOzgcloudAdministrationAddress" . }}
               {{- end }}
+              - name: ozgcloud_mandant
+                value: {{ (.Values.ozgcloud).bezeichner }}
               {{- with include "app.getCustomList" . }}
 {{ . | indent 14 }}
               {{- end }}

aggregation-manager-job/src/main/helm/templates/network_policy.yaml

@@ -84,6 +84,18 @@ spec:
           protocol: UDP
         - port: 5353
           protocol: TCP
+    {{- if ((.Values.ozgcloud).aggregationManagerServer).namespace }}
+    - to:
+        - namespaceSelector:
+            matchLabels:
+              kubernetes.io/metadata.name: {{ ((.Values.ozgcloud).aggregationManagerServer).namespace }}
+          podSelector:
+            matchLabels:
+              component: aggregation-manager-server
+      ports:
+        - port: 9090
+          protocol: TCP
+    {{- end }}
 {{- with (.Values.networkPolicy).additionalEgressConfigLocal }}
 {{ toYaml . | indent 2 }}
 {{- end }}

aggregation-manager-job/src/main/helm/values.yaml

@@ -29,6 +29,8 @@ image:
 
 ozgcloud:
   environment:
+  vorgangManager:
+    negotiationType: PLAINTEXT
 
 database:
   useExternal: false
@@ -38,9 +40,6 @@ database:
     enabled: false
     secretName: ozg-mongodb-tls-cert
 
-vorgangManager:
-  grpcClientNegotiationType: PLAINTEXT
-
 cronjob:
   schedule: "0 0 * * *"
   successfulJobsHistoryLimit: 3

aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerGrpcConfiguration.java

@@ -58,7 +58,7 @@ public class AggregationManagerGrpcConfiguration {
 	}
 
 	@Bean
-	@ConditionalOnProperty("grpc.client.aggregation-manager.address")
+	@ConditionalOnProperty("grpc.client.aggregation-manager-server.address")
 	AggregationDataRemoteService aggregationDataRemoteService(AggregationManagerProperties properties, GrpcAggregationDataMapper grpcAggregationDataMapper) {
 		return new AggregationDataRemoteService(aggregationDataServiceStub, properties, grpcAggregationDataMapper);
 	}

aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteLoader.java

@@ -36,7 +36,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
 @Component
-@ConditionalOnProperty("grpc.client.aggregation-manager.address")
+@ConditionalOnProperty("grpc.client.aggregation-manager-server.address")
 @RequiredArgsConstructor
 @Log4j2
 public class AggregationDataRemoteLoader implements AggregationDataLoader {

aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/extern/AggregationDataRemoteService.java

@@ -45,7 +45,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
 @RequiredArgsConstructor
 public class AggregationDataRemoteService {
 
-	@GrpcClient("aggregation-manager")
+	@GrpcClient("aggregation-manager-server")
 	private final AggregationDataServiceGrpc.AggregationDataServiceStub serviceStub;
 	private final AggregationManagerProperties properties;
 	private final GrpcAggregationDataMapper grpcAggregationDataMapper;

aggregation-manager-job/src/test/helm/cronjob_env_test.yaml

@@ -93,11 +93,22 @@ tests:
           content:
             name: grpc_client_vorgang-manager_address
             value: "dns:///vorgang-manager.sh-helm-test:9090"
+      - notContains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_aggregation-manager-server_address
+          any: true
+      - notContains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_aggregation-manager-server_negotiationType
+          any: true
+
   - it: should set grpc_client_vorgang-manager_address
     set:
-      env:
-        grpcClientVorgangManagerAddress: dns:///vorgang-manager.de:9090
       ozgcloud:
+        vorgangManager:
+          address: dns:///vorgang-manager.de:9090
         environment: dev
     asserts:
       - contains:
@@ -129,6 +140,58 @@ tests:
             name: ozgcloud_administration_address
             value: http://test-administration:8080
 
+  - it: should set grpc_client_aggregation-manager-server_address
+    set:
+      ozgcloud:
+        aggregationManagerServer:
+          address: dns:///aggregation-manager-server.de:9090
+        environment: dev
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_aggregation-manager-server_address
+            value: dns:///aggregation-manager-server.de:9090
+
+  - it: should set grpc_client_aggregation-manager-server_negotiationType
+    set:
+      ozgcloud:
+        aggregationManagerServer:
+          address: dns:///aggregation-manager-server.de:9090
+          negotiationType: PLAINTEXT
+        environment: dev
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_aggregation-manager-server_negotiationType
+            value: PLAINTEXT
+
+  - it: should set grpc_client_aggregation-manager-server_negotiationType to default value
+    set:
+      ozgcloud:
+        aggregationManagerServer:
+          address: dns:///aggregation-manager-server.de:9090
+        environment: dev
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_aggregation-manager-server_negotiationType
+            value: TLS
+
+  - it: should set mandant to value of bezeichner
+    set:
+      ozgcloud:
+        bezeichner: helmtest-kiel.dev
+        environment: dev
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].env
+          content:
+            name: ozgcloud_mandant
+            value: helmtest-kiel.dev
+
   - it: should fail template when env not set
     set:
     asserts:

aggregation-manager-job/src/test/helm/network_policy_test.yaml

@@ -112,6 +112,28 @@ tests:
               - Ingress
               - Egress
 
+  - it: add egress rule for aggregation-manager-server
+    set:
+      ozgcloud:
+        aggregationManagerServer:
+          namespace: test-aggregation-dns
+      networkPolicy:
+        dnsServerNamespace: kube-system
+    asserts:
+      - contains:
+          path: spec.egress
+          content:
+            to:
+              - namespaceSelector:
+                  matchLabels:
+                    kubernetes.io/metadata.name: test-aggregation-dns
+                podSelector:
+                  matchLabels:
+                    component: aggregation-manager-server
+            ports:
+              - port: 9090
+                protocol: TCP
+
   - it: add ingress rule by values local
     set:
       networkPolicy:

aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/extern/SpringContextITCase.java

@@ -41,7 +41,7 @@ class SpringContextITCase {
 
 	@Nested
 	@ITCase
-	@TestPropertySource(properties = { "grpc.client.aggregation-manager.address=static://127.0.0.1:9090" })
+	@TestPropertySource(properties = { "grpc.client.aggregation-manager-server.address=static://127.0.0.1:9090" })
 	class OnAggregationManagerAddressSet {
 
 		@Autowired

aggregation-manager-server/src/main/helm/templates/network_policy.yaml

@@ -43,6 +43,14 @@ spec:
     ports:
     - protocol: TCP
       port: 8081
+  - from:
+      - namespaceSelector: { }
+        podSelector:
+          matchLabels:
+            component: aggregation-manager-job
+    ports:
+      - port: 9090
+        protocol: TCP
 {{- with (.Values.networkPolicy).additionalIngressConfigLocal }}
 {{ toYaml . | indent 2 }}
 {{- end }}

aggregation-manager-server/src/test/helm/network_policy_test.yaml

@@ -91,6 +91,14 @@ tests:
                 ports:
                   - port: 8081
                     protocol: TCP
+              - from:
+                  - namespaceSelector: { }
+                    podSelector:
+                      matchLabels:
+                        component: aggregation-manager-job
+                ports:
+                  - port: 9090
+                    protocol: TCP
             podSelector:
               matchLabels:
                 component: aggregation-manager-server