From a5a6d729430f4ef082d38b851785ee595a64f8a2 Mon Sep 17 00:00:00 2001 From: mutron3k Date: Fri, 21 Dec 2018 14:51:10 -0500 Subject: [PATCH] adding SSL version option (#10176) * adding SSL version option Signed-off-by: Adam Sloan * adding SSL version option Signed-off-by: Adam Sloan * adding SSL version option Signed-off-by: Adam Sloan * adding SSL version option Signed-off-by: Adam Sloan * adding SSL version option depending on scheme being https Signed-off-by: Adam Sloan * adding SSL version option Signed-off-by: Adam Sloan --- stable/fluentd-elasticsearch/Chart.yaml | 2 +- stable/fluentd-elasticsearch/templates/daemonset.yaml | 2 ++ stable/fluentd-elasticsearch/values.yaml | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stable/fluentd-elasticsearch/Chart.yaml b/stable/fluentd-elasticsearch/Chart.yaml index 85d8491b04..205c1cbcaf 100644 --- a/stable/fluentd-elasticsearch/Chart.yaml +++ b/stable/fluentd-elasticsearch/Chart.yaml @@ -1,5 +1,5 @@ name: fluentd-elasticsearch -version: 2.0.0 +version: 2.0.1 appVersion: 2.3.2 home: https://www.fluentd.org/ description: A Fluentd Helm chart for Kubernetes with Elasticsearch output diff --git a/stable/fluentd-elasticsearch/templates/daemonset.yaml b/stable/fluentd-elasticsearch/templates/daemonset.yaml index ea4fa5214d..fdcd67e8cd 100644 --- a/stable/fluentd-elasticsearch/templates/daemonset.yaml +++ b/stable/fluentd-elasticsearch/templates/daemonset.yaml @@ -50,6 +50,8 @@ spec: value: {{ .Values.elasticsearch.logstash_prefix | quote }} - name: OUTPUT_SCHEME value: {{ .Values.elasticsearch.scheme | quote }} + - name: OUTPUT_SSL_VERSION + value: {{ .Values.elasticsearch.ssl_version | quote }} - name: OUTPUT_BUFFER_CHUNK_LIMIT value: {{ .Values.elasticsearch.buffer_chunk_limit | quote }} - name: OUTPUT_BUFFER_QUEUE_LIMIT diff --git a/stable/fluentd-elasticsearch/values.yaml b/stable/fluentd-elasticsearch/values.yaml index bc66241611..b0f5e794ce 100644 --- a/stable/fluentd-elasticsearch/values.yaml +++ b/stable/fluentd-elasticsearch/values.yaml @@ -20,10 +20,11 @@ resources: {} elasticsearch: host: 'elasticsearch-client' port: 9200 + scheme: 'http' + ssl_version: TLSv1_2 buffer_chunk_limit: 2M buffer_queue_limit: 8 logstash_prefix: 'logstash' - scheme: 'http' # If you want to add custom environment variables, use the env dict # You can then reference these in your config file e.g.: @@ -452,6 +453,7 @@ configMaps: host "#{ENV['OUTPUT_HOST']}" port "#{ENV['OUTPUT_PORT']}" scheme "#{ENV['OUTPUT_SCHEME']}" + ssl_version "#{ENV['OUTPUT_SSL_VERSION']}" logstash_format true logstash_prefix "#{ENV['LOGSTASH_PREFIX']}"