From 355db43398e728010b9a93a31e0dcd5e195e24d5 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 30 Sep 2024 11:01:34 +0200
Subject: [PATCH] OZG-6835 add grpc dns prefix
---
src/main/helm/templates/_helpers.tpl | 4 ++--
src/main/helm/values.yaml | 2 +-
src/test/helm/deployment_grpc_user_manager_address_test.yaml | 2 +-
.../helm/deployment_nachrichten_manager_address_test.yaml | 2 +-
src/test/helm/deployment_zufimanager_address_env_test.yaml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 1317f415c..9b9f1b39f 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.databaseSecretName" -}}
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 30fe6d16e..7bad7a05a 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -58,7 +58,7 @@ vorgangmanagerName: vorgang-manager
usermanagerName: user-manager
zufiManager:
- address: dns://zufi-manager.zufi:9090
+ address: dns:///zufi-manager.zufi:9090
elasticsearch:
certificateSecretName: elasticsearch-certificate
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 1e31f050c..a26e7cb0c 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 b91b3cc5f..67887800a 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_zufimanager_address_env_test.yaml b/src/test/helm/deployment_zufimanager_address_env_test.yaml
index 8a16fc9df..687a53ee8 100644
--- a/src/test/helm/deployment_zufimanager_address_env_test.yaml
+++ b/src/test/helm/deployment_zufimanager_address_env_test.yaml
@@ -39,4 +39,4 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: ozgcloud_zufi-manager_address
- value: dns://zufi-manager.zufi:9090
+ value: dns:///zufi-manager.zufi:9090
--
GitLab