From c9bdaa7ec2800b5520d96858d222c95a684aa5c2 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 6 Sep 2024 16:12:07 +0200
Subject: [PATCH] OZG-6499 Move configserver suffix from helm charts to
application.yaml
---
alfa-server/src/main/resources/application.yml | 2 +-
src/main/helm/templates/_helpers.tpl | 2 +-
src/test/helm/deployment_config_client_env_test.yaml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/alfa-server/src/main/resources/application.yml b/alfa-server/src/main/resources/application.yml
index 46c43c0b39..f5642fefec 100644
--- a/alfa-server/src/main/resources/application.yml
+++ b/alfa-server/src/main/resources/application.yml
@@ -24,7 +24,7 @@ spring:
issuer-uri: ${ozgcloud.oauth2.issuer-uri}
jwk-set-uri: ${spring.security.oauth2.resourceserver.jwt.issuer-uri}/protocol/openid-connect/certs
config:
- import: optional:configserver:${ozgcloud_administration_address:http://localhost:8888/configserver/}
+ import: optional:configserver:${ozgcloud_administration_address:http://localhost:8888}/configserver/
server:
http2:
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 1bcec7ddda..fde4331dfd 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -58,7 +58,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}}
{{- define "app.spring_cloud_config_administration_address" -}}
-{{ printf "%s.%s:8080/configserver" ( coalesce .Values.administrationName "administration" ) .Release.Namespace }}
+{{ printf "%s.%s:8080" ( coalesce .Values.administrationName "administration" ) .Release.Namespace }}
{{- end -}}
{{- define "app.baseUrl" -}}
diff --git a/src/test/helm/deployment_config_client_env_test.yaml b/src/test/helm/deployment_config_client_env_test.yaml
index 25ccaef452..685256ac81 100644
--- a/src/test/helm/deployment_config_client_env_test.yaml
+++ b/src/test/helm/deployment_config_client_env_test.yaml
@@ -20,7 +20,7 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: ozgcloud_administration_address
- value: administration.sh-helm-test:8080/configserver
+ value: administration.sh-helm-test:8080
- it: should have set administration server address
set:
administrationName: custom_admin_name
@@ -29,4 +29,4 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: ozgcloud_administration_address
- value: custom_admin_name.sh-helm-test:8080/configserver
+ value: custom_admin_name.sh-helm-test:8080
--
GitLab