diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 9572624be0d4968d2d9c0a10e115e6e8986b6eea..d3319d470a404cdc82ea1f46d66de742c7b4662b 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -62,7 +62,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}}
{{- define "app.grpc_client_user-manager_address" -}}
-{{ printf "%s.%s:9000" .Values.usermanagerName .Release.Namespace }}
+{{ printf "dns:///%s.%s:9000" .Values.usermanagerName .Release.Namespace }}
{{- end -}}
{{- define "app.ozgcloud_migration_user-manager_address" -}}
@@ -70,7 +70,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}}
{{- define "app.ozgcloud_vorgangmanager_address" -}}
-{{ printf "%s.%s:9090" .Values.vorgangmanagerName .Release.Namespace }}
+{{ printf "dns:///%s.%s:9090" .Values.vorgangmanagerName .Release.Namespace }}
{{- end -}}
{{- define "app.ozgcloud_administration_address" -}}
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index c4e7b1925313525a253447cd317205b4f5cd8577..ba379a93e17e623cf46bbc3f6e05aa8750eacff8 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -156,11 +156,11 @@ spec:
- name: ozgcloud_user-manager_url
value: {{ include "app.ozgcloud_migration_user-manager_address" . }}
- name: ozgcloud_zufi-manager_address
- value: {{ ((.Values.ozgcloud).zufiManager).address }}
+ value: {{ (.Values.zufiManager).address }}
- name: grpc_client_zufi-manager_address
- value: {{ ((.Values.ozgcloud).zufiManager).address }}
+ value: {{ (.Values.zufiManager).address }}
- name: grpc_client_zufi-manager_negotiationType
- value: {{ ((.Values.ozgcloud).zufiManager).negotiationType }}
+ value: {{ (.Values.zufiManager).grpcClientNegotiationType }}
{{- if not (.Values.database).useExternal }}
- name: spring_data_mongodb_uri
valueFrom:
@@ -236,6 +236,10 @@ spec:
- name: ozgcloud_feature_bescheid_kielHackathonRoute
value: {{ quote (((.Values.ozgcloud).feature).bescheid).kielHackathonRoute }}
{{- end }}
+ {{- if (((.Values.ozgcloud).notification).eingangsbestaetigung).replyAllowed }}
+ - name: ozgcloud_notification_eingangsbestaetigung_replyAllowed
+ value: {{ quote (((.Values.ozgcloud).notification).eingangsbestaetigung).replyAllowed }}
+ {{- end }}
{{- if (.Values.ozgcloud).processors}}
{{- range $processor_index, $processor := (.Values.ozgcloud).processors }}
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 8cb0da68112456450aafe00a511e2e06c4ccfb01..6a380e033dcf8986792b1e8b8ca9f92a4ab81a0c 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -60,7 +60,7 @@ usermanagerName: user-manager
administrationName: administration
zufiManager:
- address: dns://zufi-manager.zufi:9090
+ address: dns:///zufi-server.zufi:9090
elasticsearch:
certificateSecretName: elasticsearch-certificate
diff --git a/src/test/helm/deployment_env_test.yaml b/src/test/helm/deployment_env_test.yaml
index 573afcbdd936a8c2721f1706297fa5fca68f5d16..4d71e36a71fcb5da19e5c6b55afd44ad528bcbd8 100644
--- a/src/test/helm/deployment_env_test.yaml
+++ b/src/test/helm/deployment_env_test.yaml
@@ -140,4 +140,16 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: ozgcloud_processors_1_forms_0_formEngineName
- value: FormSolutions
\ No newline at end of file
+ value: FormSolutions
+ - it: should have notification properties
+ set:
+ ozgcloud:
+ notification:
+ eingangsbestaetigung:
+ replyAllowed: true
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: ozgcloud_notification_eingangsbestaetigung_replyAllowed
+ value: "true"
\ No newline at end of file
diff --git a/src/test/helm/deployment_grpc_user_manager_address_test.yaml b/src/test/helm/deployment_grpc_user_manager_address_test.yaml
index 1e31f050c93476fd389121baed48304cd9b58747..a26e7cb0ceed7622dd361937c32f5074b6e60567 100644
--- a/src/test/helm/deployment_grpc_user_manager_address_test.yaml
+++ b/src/test/helm/deployment_grpc_user_manager_address_test.yaml
@@ -39,7 +39,7 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: grpc_client_user-manager_address
- value: user-manager.sh-helm-test:9000
+ value: dns:///user-manager.sh-helm-test:9000
- it: should contain default user-manager grpc negotiationType tls
asserts:
- contains:
diff --git a/src/test/helm/deployment_nachrichten_manager_address_test.yaml b/src/test/helm/deployment_nachrichten_manager_address_test.yaml
index b91b3cc5fe1d814a525fc99464add26e746aa617..67887800a93d5637f079a8aaed0ffa08e588a8af 100644
--- a/src/test/helm/deployment_nachrichten_manager_address_test.yaml
+++ b/src/test/helm/deployment_nachrichten_manager_address_test.yaml
@@ -39,4 +39,4 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: ozgcloud_nachrichten-manager_address
- value: vorgang-manager.sh-helm-test:9090
+ value: dns:///vorgang-manager.sh-helm-test:9090
diff --git a/src/test/helm/deployment_vorgang_manager_env_test.yaml b/src/test/helm/deployment_vorgang_manager_env_test.yaml
index 9c853ce49c633ca9a424d88c96771d89e56acff0..4626fa9296378d85086ac3e15513241aa785e23d 100644
--- a/src/test/helm/deployment_vorgang_manager_env_test.yaml
+++ b/src/test/helm/deployment_vorgang_manager_env_test.yaml
@@ -39,4 +39,4 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: ozgcloud_application_address
- value: vorgang-manager.by-helm-test:9090
\ No newline at end of file
+ value: dns:///vorgang-manager.by-helm-test:9090
\ No newline at end of file
diff --git a/src/test/helm/deployment_zufimanager_address_env_test.yaml b/src/test/helm/deployment_zufimanager_address_env_test.yaml
index bdc9ce197349f1e64df32fd7f22a3e6d57e4a5ce..d73c2e5b39e192cfe0f30908ccaa4c2d5d22fe1c 100644
--- a/src/test/helm/deployment_zufimanager_address_env_test.yaml
+++ b/src/test/helm/deployment_zufimanager_address_env_test.yaml
@@ -31,29 +31,50 @@ templates:
set:
ozgcloud:
environment: dev
- zufiManager:
- address: zufi-manager.zufi:9090
imagePullSecret: test-image-pull-secret
tests:
- - it: check if zufi-manager address is correct
+ - it: check default zufi-manager address
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
name: ozgcloud_zufi-manager_address
- value: zufi-manager.zufi:9090
- - it: check if zufi-manager grpc client address is set
+ value: dns:///zufi-server.zufi:9090
+
+ - it: should set custom zufi-manager address
+ set:
+ zufiManager:
+ address: dns://other.zufi:9090
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: ozgcloud_zufi-manager_address
+ value: dns://other.zufi:9090
+
+ - it: check default zufi-manager grpc client address
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
name: grpc_client_zufi-manager_address
- value: zufi-manager.zufi:9090
+ value: dns:///zufi-server.zufi:9090
+
+ - it: should set custom zufi-manager grpc client address
+ set:
+ zufiManager:
+ address: dns://other.zufi:9090
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: grpc_client_zufi-manager_address
+ value: dns://other.zufi:9090
+
- it: check if zufi-manager negotiationType is set
set:
- ozgcloud:
- zufiManager:
- negotiationType: NOT_DEFAULT
+ zufiManager:
+ grpcClientNegotiationType: NOT_DEFAULT
asserts:
- contains:
path: spec.template.spec.containers[0].env
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java
index 5619394f22f8f157ab894374c8d62b735d156245..aab5f17c1c67ebe61d6122fb13a3da561628ed6b 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java
@@ -21,8 +21,10 @@ class ZufiRemoteService {
private VorgangManagerRegistrationServiceBlockingStub serviceStub;
public void registerVorgangManager(@NonNull List<String> organistationsEinheitenIds, String vorgangManagerAddress) {
- boolean success = getServiceStub().register(buildRequest(organistationsEinheitenIds, vorgangManagerAddress)).getSuccess();
- LOG.info("Register success: {}", success);
+ var result = getServiceStub().register(buildRequest(organistationsEinheitenIds, vorgangManagerAddress));
+ if (!result.getSuccess()) {
+ LOG.warn("Registration failed: {}", result.getMessage());
+ }
}
private VorgangManagerRegistrationServiceBlockingStub getServiceStub() {