diff --git a/alfa-server/src/main/resources/application.yml b/alfa-server/src/main/resources/application.yml index 46c43c0b39063acf6a99c612f24062a4568a91a3..f5642fefecceda5c3f88a333ad14c835c5394bc1 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 1bcec7ddda2ec2df9db8bcb2eaff6c3997d70c04..fde4331dfd49596e35b70f963d173d9126302495 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 25ccaef45255f8d261fe735c2e3a6e9aa9e1543f..685256ac81c50e48eee0c7c90f1242954f1fe37f 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