From 06643b14d04ba9c5859c9aef2745c1f598b7aa69 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 18 Sep 2024 09:30:35 +0200
Subject: [PATCH] OZG-6730 set grpc.server.port default value
---
src/main/helm/templates/deployment.yaml | 4 ++--
src/main/helm/values.yaml | 5 ++++-
src/test/helm/deployment_env_test.yaml | 22 ++++++++++++----------
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index cd6460a..610244f 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -61,9 +61,9 @@ spec:
- name: HTTP_SERVER_PORT
value: "8082"
- name: GRPC_SERVER_MOCK
- value: "{{ ((.Values.grpc).server).mock | default false }}"
+ value: "{{ ((.Values.grpc).server).mock }}"
- name: GRPC_SERVER_PORT
- value: "{{ required "Values.grpc.server.port must be set" ((.Values.grpc).server).port }}"
+ value: "{{ ((.Values.grpc).server).port }}"
{{- with include "app.getCustomList" . }}
{{ . | indent 10 }}
{{- end }}
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 09010a8..e0ed2fb 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -33,4 +33,7 @@ image:
-
+grpc:
+ server:
+ port: 9090
+ mock: false
\ No newline at end of file
diff --git a/src/test/helm/deployment_env_test.yaml b/src/test/helm/deployment_env_test.yaml
index 9cac3fe..21b6ccb 100644
--- a/src/test/helm/deployment_env_test.yaml
+++ b/src/test/helm/deployment_env_test.yaml
@@ -69,11 +69,7 @@ tests:
name: test_environment
value: "B test value"
- - it: check envs
- set:
- grpc:
- server:
- port: 9090
+ - it: check envs default values
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -95,7 +91,6 @@ tests:
set:
grpc:
server:
- port: 9090
mock: true
asserts:
- contains:
@@ -103,8 +98,15 @@ tests:
content:
name: GRPC_SERVER_MOCK
value: "true"
-
- - it: should fail template if grpc.server.port not set
+
+ - it: should set GRPC_SERVER_PORT
+ set:
+ grpc:
+ server:
+ port: 9091
asserts:
- - failedTemplate:
- errormessage: Values.grpc.server.port must be set
\ No newline at end of file
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: GRPC_SERVER_PORT
+ value: "9091"
\ No newline at end of file
--
GitLab