From 73839b7a29a9a0d4ad69771fa68f5a19ebc1f4b8 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 30 Sep 2024 13:41:34 +0200
Subject: [PATCH] OZG-6835 add grpc dns prefix
---
src/main/helm/templates/deployment.yaml | 2 +-
src/test/helm/deployment_routing_strategy_env_test.yaml | 6 ++++++
...s_create_or_not.yaml => ingress_create_or_not_test.yaml} | 0
.../{ingress_nginx_tests.yaml => ingress_nginx_test.yaml} | 0
.../src/main/helm/templates/xta_adapter_cronjob.yaml | 2 +-
xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml | 4 ++--
6 files changed, 10 insertions(+), 4 deletions(-)
rename src/test/helm/{ingress_create_or_not.yaml => ingress_create_or_not_test.yaml} (100%)
rename src/test/helm/{ingress_nginx_tests.yaml => ingress_nginx_test.yaml} (100%)
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index c68b9d69b..b59bb1cc4 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -79,7 +79,7 @@ spec:
- name: ozgcloud_adapter_targetVorgangManagerName
value: {{ (.Values.routing).targetVorgangManagerName}}
- name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName}}_address
- value: 'vorgang-manager.{{ coalesce (.Values.routing).targetNamespace .Release.Namespace }}:9090'
+ value: 'dns:///vorgang-manager.{{ coalesce (.Values.routing).targetNamespace .Release.Namespace }}:9090'
- name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName}}_negotiationType
value: {{ (.Values.routing).negotiationType | default "TLS" }}
{{- end }}
diff --git a/src/test/helm/deployment_routing_strategy_env_test.yaml b/src/test/helm/deployment_routing_strategy_env_test.yaml
index 8ae56386a..e70cff6f1 100644
--- a/src/test/helm/deployment_routing_strategy_env_test.yaml
+++ b/src/test/helm/deployment_routing_strategy_env_test.yaml
@@ -50,6 +50,12 @@ tests:
content:
name: grpc_client_vorgang-manager-vorgang-manager_negotiationType
value: TLS
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: grpc_client_vorgang-manager-vorgang-manager_address
+ value: dns:///vorgang-manager.sh-helm-test:9090
+
- it: validate routing infos
set:
routing:
diff --git a/src/test/helm/ingress_create_or_not.yaml b/src/test/helm/ingress_create_or_not_test.yaml
similarity index 100%
rename from src/test/helm/ingress_create_or_not.yaml
rename to src/test/helm/ingress_create_or_not_test.yaml
diff --git a/src/test/helm/ingress_nginx_tests.yaml b/src/test/helm/ingress_nginx_test.yaml
similarity index 100%
rename from src/test/helm/ingress_nginx_tests.yaml
rename to src/test/helm/ingress_nginx_test.yaml
diff --git a/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml b/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml
index 3835e3ec4..761959137 100644
--- a/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml
+++ b/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml
@@ -81,7 +81,7 @@ spec:
- name: ozgcloud_adapter_targetVorgangManagerName
value: {{ (.Values.routing).targetVorgangManagerName}}
- name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName }}_address
- value: 'vorgang-manager.{{ coalesce (.Values.routing).targetNamespace .Release.Namespace }}:9090'
+ value: 'dns:///vorgang-manager.{{ coalesce (.Values.routing).targetNamespace .Release.Namespace }}:9090'
- name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName }}_negotiationType
value: {{ (.Values.routing).negotiationType | default "PLAINTEXT" }}
{{- end }}
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
index 77547800e..e247e20d6 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
@@ -107,7 +107,7 @@ tests:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
name: grpc_client_vorgang-manager-vorgang-manager_address
- value: 'vorgang-manager.helm-test:9090'
+ value: 'dns:///vorgang-manager.helm-test:9090'
- contains:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
@@ -152,7 +152,7 @@ tests:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
name: grpc_client_vorgang-manager-vorgang-manager_address
- value: 'vorgang-manager.helm-test:9090'
+ value: 'dns:///vorgang-manager.helm-test:9090'
- contains:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
--
GitLab