From 069a66d9669fae8a1804d33ac4cf1c754898a4ed Mon Sep 17 00:00:00 2001 From: "Szekeres, Balazs (Nokia - HU/Budapest)" Date: Mon, 8 Jul 2019 16:44:38 +0200 Subject: [PATCH] Infra chart update Elasticsearch url was missing from the values Change-Id: I2ee93f6463e2b4df2aeb609ea92cf8679a434ba7 Signed-off-by: Szekeres, Balazs (Nokia - HU/Budapest) --- SPECS/infra-charts.spec | 2 +- infra-charts/templates/fluentd-daemonset.yaml | 2 +- infra-charts/values.yaml.j2 | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SPECS/infra-charts.spec b/SPECS/infra-charts.spec index b51e721..cba2a0a 100644 --- a/SPECS/infra-charts.spec +++ b/SPECS/infra-charts.spec @@ -15,7 +15,7 @@ %define COMPONENT infra-charts %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.0.0 -%define RPM_MINOR_VERSION 12 +%define RPM_MINOR_VERSION 13 Name: %{RPM_NAME} Version: %{RPM_MAJOR_VERSION} diff --git a/infra-charts/templates/fluentd-daemonset.yaml b/infra-charts/templates/fluentd-daemonset.yaml index 79d0a18..7477ce5 100644 --- a/infra-charts/templates/fluentd-daemonset.yaml +++ b/infra-charts/templates/fluentd-daemonset.yaml @@ -63,7 +63,7 @@ spec: - name: KUBERNETES_SERVICE_PORT value: "{{ .Values.fluentd.apiserver_svc_port }}" - name: FLUENT_ELASTICSEARCH_HOST - value: {{ .Values.elasticsearch.host }} + value: {{ .Values.elasticsearch.url }} - name: FLUENT_ELASTICSEARCH_PORT value: "{{ .Values.elasticsearch.port }}" - name: FLUENT_ELASTICSEARCH_SCHEME diff --git a/infra-charts/values.yaml.j2 b/infra-charts/values.yaml.j2 index 6d34676..045e107 100644 --- a/infra-charts/values.yaml.j2 +++ b/infra-charts/values.yaml.j2 @@ -68,6 +68,7 @@ elasticsearch: {% if caas.infra_log_store is defined and caas.infra_log_store != 'remote_syslog' %} required: true {% endif %} + url: {{ caas.elasticsearch_url }} port: {{ caas.elasticsearch_port }} scheme: {{ caas.elasticsearch_scheme }} logstash_prefix: {{ caas.elasticsearch_logstash_prefix }} -- 2.16.6