Skip to content
Snippets Groups Projects
Commit a69e67ac authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into OZG-6710-Update-common-lib

parents c00667f3 b0f09fe3
No related branches found
No related tags found
No related merge requests found
...@@ -62,7 +62,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} ...@@ -62,7 +62,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}} {{- end -}}
{{- define "app.grpc_client_user-manager_address" -}} {{- 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 -}} {{- end -}}
{{- define "app.ozgcloud_migration_user-manager_address" -}} {{- define "app.ozgcloud_migration_user-manager_address" -}}
...@@ -70,7 +70,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} ...@@ -70,7 +70,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}} {{- end -}}
{{- define "app.ozgcloud_vorgangmanager_address" -}} {{- define "app.ozgcloud_vorgangmanager_address" -}}
{{ printf "%s.%s:9090" .Values.vorgangmanagerName .Release.Namespace }} {{ printf "dns:///%s.%s:9090" .Values.vorgangmanagerName .Release.Namespace }}
{{- end -}} {{- end -}}
{{- define "app.ozgcloud_administration_address" -}} {{- define "app.ozgcloud_administration_address" -}}
......
...@@ -156,11 +156,11 @@ spec: ...@@ -156,11 +156,11 @@ spec:
- name: ozgcloud_user-manager_url - name: ozgcloud_user-manager_url
value: {{ include "app.ozgcloud_migration_user-manager_address" . }} value: {{ include "app.ozgcloud_migration_user-manager_address" . }}
- name: ozgcloud_zufi-manager_address - name: ozgcloud_zufi-manager_address
value: {{ ((.Values.ozgcloud).zufiManager).address }} value: {{ (.Values.zufiManager).address }}
- name: grpc_client_zufi-manager_address - name: grpc_client_zufi-manager_address
value: {{ ((.Values.ozgcloud).zufiManager).address }} value: {{ (.Values.zufiManager).address }}
- name: grpc_client_zufi-manager_negotiationType - name: grpc_client_zufi-manager_negotiationType
value: {{ ((.Values.ozgcloud).zufiManager).negotiationType }} value: {{ (.Values.zufiManager).grpcClientNegotiationType }}
{{- if not (.Values.database).useExternal }} {{- if not (.Values.database).useExternal }}
- name: spring_data_mongodb_uri - name: spring_data_mongodb_uri
valueFrom: valueFrom:
...@@ -236,6 +236,10 @@ spec: ...@@ -236,6 +236,10 @@ spec:
- name: ozgcloud_feature_bescheid_kielHackathonRoute - name: ozgcloud_feature_bescheid_kielHackathonRoute
value: {{ quote (((.Values.ozgcloud).feature).bescheid).kielHackathonRoute }} value: {{ quote (((.Values.ozgcloud).feature).bescheid).kielHackathonRoute }}
{{- end }} {{- end }}
{{- if (((.Values.ozgcloud).notification).eingangsbestaetigung).replyAllowed }}
- name: ozgcloud_notification_eingangsbestaetigung_replyAllowed
value: {{ quote (((.Values.ozgcloud).notification).eingangsbestaetigung).replyAllowed }}
{{- end }}
{{- if (.Values.ozgcloud).processors}} {{- if (.Values.ozgcloud).processors}}
{{- range $processor_index, $processor := (.Values.ozgcloud).processors }} {{- range $processor_index, $processor := (.Values.ozgcloud).processors }}
......
...@@ -60,7 +60,7 @@ usermanagerName: user-manager ...@@ -60,7 +60,7 @@ usermanagerName: user-manager
administrationName: administration administrationName: administration
zufiManager: zufiManager:
address: dns://zufi-manager.zufi:9090 address: dns:///zufi-server.zufi:9090
elasticsearch: elasticsearch:
certificateSecretName: elasticsearch-certificate certificateSecretName: elasticsearch-certificate
......
...@@ -141,3 +141,15 @@ tests: ...@@ -141,3 +141,15 @@ tests:
content: content:
name: ozgcloud_processors_1_forms_0_formEngineName name: ozgcloud_processors_1_forms_0_formEngineName
value: FormSolutions 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
...@@ -39,7 +39,7 @@ tests: ...@@ -39,7 +39,7 @@ tests:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: grpc_client_user-manager_address 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 - it: should contain default user-manager grpc negotiationType tls
asserts: asserts:
- contains: - contains:
......
...@@ -39,4 +39,4 @@ tests: ...@@ -39,4 +39,4 @@ tests:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: ozgcloud_nachrichten-manager_address name: ozgcloud_nachrichten-manager_address
value: vorgang-manager.sh-helm-test:9090 value: dns:///vorgang-manager.sh-helm-test:9090
...@@ -39,4 +39,4 @@ tests: ...@@ -39,4 +39,4 @@ tests:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: ozgcloud_application_address name: ozgcloud_application_address
value: vorgang-manager.by-helm-test:9090 value: dns:///vorgang-manager.by-helm-test:9090
\ No newline at end of file \ No newline at end of file
...@@ -31,29 +31,50 @@ templates: ...@@ -31,29 +31,50 @@ templates:
set: set:
ozgcloud: ozgcloud:
environment: dev environment: dev
zufiManager:
address: zufi-manager.zufi:9090
imagePullSecret: test-image-pull-secret imagePullSecret: test-image-pull-secret
tests: 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: dns:///zufi-server.zufi:9090
- it: should set custom zufi-manager address
set:
zufiManager:
address: dns://other.zufi:9090
asserts: asserts:
- contains: - contains:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: ozgcloud_zufi-manager_address name: ozgcloud_zufi-manager_address
value: zufi-manager.zufi:9090 value: dns://other.zufi:9090
- it: check if zufi-manager grpc client address is set
- it: check default zufi-manager grpc client address
asserts: asserts:
- contains: - contains:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: grpc_client_zufi-manager_address 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 - it: check if zufi-manager negotiationType is set
set: set:
ozgcloud:
zufiManager: zufiManager:
negotiationType: NOT_DEFAULT grpcClientNegotiationType: NOT_DEFAULT
asserts: asserts:
- contains: - contains:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
......
...@@ -21,8 +21,10 @@ class ZufiRemoteService { ...@@ -21,8 +21,10 @@ class ZufiRemoteService {
private VorgangManagerRegistrationServiceBlockingStub serviceStub; private VorgangManagerRegistrationServiceBlockingStub serviceStub;
public void registerVorgangManager(@NonNull List<String> organistationsEinheitenIds, String vorgangManagerAddress) { public void registerVorgangManager(@NonNull List<String> organistationsEinheitenIds, String vorgangManagerAddress) {
boolean success = getServiceStub().register(buildRequest(organistationsEinheitenIds, vorgangManagerAddress)).getSuccess(); var result = getServiceStub().register(buildRequest(organistationsEinheitenIds, vorgangManagerAddress));
LOG.info("Register success: {}", success); if (!result.getSuccess()) {
LOG.warn("Registration failed: {}", result.getMessage());
}
} }
private VorgangManagerRegistrationServiceBlockingStub getServiceStub() { private VorgangManagerRegistrationServiceBlockingStub getServiceStub() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment