From 03d56f54f3cbec4d1ca1a4e9ee30b96868a8f068 Mon Sep 17 00:00:00 2001 From: LE SAULNIER Kevin Date: Tue, 10 Dec 2024 10:20:30 +0100 Subject: [PATCH 1/2] feat: allow multiple ES URI Signed-off-by: LE SAULNIER Kevin --- k8s/live/azure-dev/common-application.yml | 9 +++++---- k8s/live/azure-integ/common-application.yml | 9 +++++---- k8s/live/local/common-application.yml | 9 +++++---- k8s/resources/common/config/common-application.yml | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/k8s/live/azure-dev/common-application.yml b/k8s/live/azure-dev/common-application.yml index 29b3e90b..5fb74a83 100644 --- a/k8s/live/azure-dev/common-application.yml +++ b/k8s/live/azure-dev/common-application.yml @@ -1,8 +1,9 @@ spring: - data: - elasticsearch: - username: ${ELASTICSEARCH_USER:#{null}} - password: ${ELASTICSEARCH_PASSWORD:#{null}} + elasticsearch: + uris: + - http://elasticsearch:9200 + username: ${ELASTICSEARCH_USER:#{null}} + password: ${ELASTICSEARCH_PASSWORD:#{null}} rabbitmq: username: ${RABBITMQ_USER:guest} password: ${RABBITMQ_PASSWORD:guest} diff --git a/k8s/live/azure-integ/common-application.yml b/k8s/live/azure-integ/common-application.yml index b41bf48d..447e3201 100644 --- a/k8s/live/azure-integ/common-application.yml +++ b/k8s/live/azure-integ/common-application.yml @@ -1,8 +1,9 @@ spring: - data: - elasticsearch: - username: ${ELASTICSEARCH_USER:#{null}} - password: ${ELASTICSEARCH_PASSWORD:#{null}} + elasticsearch: + uris: + - http://elasticsearch:9200 + username: ${ELASTICSEARCH_USER:#{null}} + password: ${ELASTICSEARCH_PASSWORD:#{null}} rabbitmq: username: ${RABBITMQ_USER:guest} password: ${RABBITMQ_PASSWORD:guest} diff --git a/k8s/live/local/common-application.yml b/k8s/live/local/common-application.yml index 5b7172bd..c41481d6 100644 --- a/k8s/live/local/common-application.yml +++ b/k8s/live/local/common-application.yml @@ -1,8 +1,9 @@ spring: - data: - elasticsearch: - username: ${ELASTICSEARCH_USER:#{null}} - password: ${ELASTICSEARCH_PASSWORD:#{null}} + elasticsearch: + uris: + - http://elasticsearch:9200 + username: ${ELASTICSEARCH_USER:#{null}} + password: ${ELASTICSEARCH_PASSWORD:#{null}} rabbitmq: username: ${RABBITMQ_USER:guest} password: ${RABBITMQ_PASSWORD:guest} diff --git a/k8s/resources/common/config/common-application.yml b/k8s/resources/common/config/common-application.yml index 5136a967..95e62ad3 100644 --- a/k8s/resources/common/config/common-application.yml +++ b/k8s/resources/common/config/common-application.yml @@ -1,8 +1,9 @@ spring: - data: - elasticsearch: - username: ${ELASTICSEARCH_USER:#{null}} - password: ${ELASTICSEARCH_PASSWORD:#{null}} + elasticsearch: + uris: + - http://elasticsearch:9200 + username: ${ELASTICSEARCH_USER:#{null}} + password: ${ELASTICSEARCH_PASSWORD:#{null}} rabbitmq: username: ${RABBITMQ_USER:guest} password: ${RABBITMQ_PASSWORD:guest} From ab5e0fee5df6ce49257a98c44a6ac3bfed8d5a17 Mon Sep 17 00:00:00 2001 From: LE SAULNIER Kevin Date: Wed, 11 Dec 2024 09:30:47 +0100 Subject: [PATCH 2/2] fix: remove redondant config Signed-off-by: LE SAULNIER Kevin --- k8s/live/azure-dev/common-application.yml | 2 -- k8s/live/azure-integ/common-application.yml | 2 -- k8s/live/local/common-application.yml | 2 -- k8s/resources/common/config/common-application.yml | 2 -- 4 files changed, 8 deletions(-) diff --git a/k8s/live/azure-dev/common-application.yml b/k8s/live/azure-dev/common-application.yml index 5fb74a83..dd198fe5 100644 --- a/k8s/live/azure-dev/common-application.yml +++ b/k8s/live/azure-dev/common-application.yml @@ -1,7 +1,5 @@ spring: elasticsearch: - uris: - - http://elasticsearch:9200 username: ${ELASTICSEARCH_USER:#{null}} password: ${ELASTICSEARCH_PASSWORD:#{null}} rabbitmq: diff --git a/k8s/live/azure-integ/common-application.yml b/k8s/live/azure-integ/common-application.yml index 447e3201..0afb9708 100644 --- a/k8s/live/azure-integ/common-application.yml +++ b/k8s/live/azure-integ/common-application.yml @@ -1,7 +1,5 @@ spring: elasticsearch: - uris: - - http://elasticsearch:9200 username: ${ELASTICSEARCH_USER:#{null}} password: ${ELASTICSEARCH_PASSWORD:#{null}} rabbitmq: diff --git a/k8s/live/local/common-application.yml b/k8s/live/local/common-application.yml index c41481d6..5832afd0 100644 --- a/k8s/live/local/common-application.yml +++ b/k8s/live/local/common-application.yml @@ -1,7 +1,5 @@ spring: elasticsearch: - uris: - - http://elasticsearch:9200 username: ${ELASTICSEARCH_USER:#{null}} password: ${ELASTICSEARCH_PASSWORD:#{null}} rabbitmq: diff --git a/k8s/resources/common/config/common-application.yml b/k8s/resources/common/config/common-application.yml index 95e62ad3..d43e746e 100644 --- a/k8s/resources/common/config/common-application.yml +++ b/k8s/resources/common/config/common-application.yml @@ -1,7 +1,5 @@ spring: elasticsearch: - uris: - - http://elasticsearch:9200 username: ${ELASTICSEARCH_USER:#{null}} password: ${ELASTICSEARCH_PASSWORD:#{null}} rabbitmq: