From c7dd67f85a8cb7cb6eda6a1d4da4de0493cc7bf1 Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.witukiewicz@mgm-tp.com>
Date: Fri, 21 Mar 2025 13:05:14 +0100
Subject: [PATCH] OZG-7573 OZG-7987 adjust names of variables
---
src/main/helm/templates/deployment.yaml | 4 ++--
src/test/helm/deployment_forwarder_env_test.yaml | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 5d1d5fc03..ca7565997 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -164,9 +164,9 @@ spec:
value: {{ (.Values.zufiManager).grpcClientNegotiationType | default "PLAINTEXT" }}
{{- end}}
- name: grpc_client_forwarder_address
- value: {{ ((.Values.ozgcloud).forwarder).address }}
+ value: {{ (.Values.forwarder).address }}
- name: grpc_client_forwarder_negotiationType
- value: {{ ((.Values.ozgcloud).forwarder).grpcClientNegotiationType | default "TLS" }}
+ value: {{ (.Values.forwarder).grpcClientNegotiationType | default "TLS" }}
{{- if not (.Values.database).useExternal }}
- name: spring_data_mongodb_uri
diff --git a/src/test/helm/deployment_forwarder_env_test.yaml b/src/test/helm/deployment_forwarder_env_test.yaml
index 77d32f017..fefb761dc 100644
--- a/src/test/helm/deployment_forwarder_env_test.yaml
+++ b/src/test/helm/deployment_forwarder_env_test.yaml
@@ -37,9 +37,8 @@ set:
tests:
- it: should set the grpc forwarder client address
set:
- ozgcloud:
- forwarder:
- address: https://forwarder.my-wonderful-domain.local:9000
+ forwarder:
+ address: https://forwarder.my-wonderful-domain.local:9000
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -55,9 +54,8 @@ tests:
value: TLS
- it: should set the negotiation type
set:
- ozgcloud:
- forwarder:
- grpcClientNegotiationType: PLAINTEXT
+ forwarder:
+ grpcClientNegotiationType: PLAINTEXT
asserts:
- contains:
path: spec.template.spec.containers[0].env
--
GitLab