adding SSL version option (#10176)

* adding SSL version option

Signed-off-by: Adam Sloan <asloan7@gmail.com>

* adding SSL version option

Signed-off-by: Adam Sloan <adam_sloan@comcast.com>

* adding SSL version option

Signed-off-by: Adam Sloan <adam_sloan@comcast.com>

* adding SSL version option

Signed-off-by: Adam Sloan <adam_sloan@comcast.com>

* adding SSL version option depending on scheme being https

Signed-off-by: Adam Sloan <adam_sloan@comcast.com>

* adding SSL version option

Signed-off-by: Adam Sloan <adam_sloan@comcast.com>
This commit is contained in:
mutron3k
2018-12-21 11:51:10 -08:00
committed by Kubernetes Prow Robot
parent 5f40fc3c4e
commit a5a6d72943
3 changed files with 6 additions and 2 deletions
+1 -1
View File
@@ -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
@@ -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
+3 -1
View File
@@ -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']}"
<buffer>