Merge pull request #1645 from smallc2009/feature/optimize-helm-chart

make tls config in elastic more clearer

Author: wenchajun

charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml

@@ -41,9 +41,9 @@ spec:
     traceError: {{ .Values.fluentbit.output.es.traceError | default false }}
     generateID: true
     timeKey: "@timestamp"
-    {{- if .Values.fluentbit.output.es.enableTLS }}
+    {{- if and .Values.fluentbit.output.es.tls .Values.fluentbit.output.es.tls.enable }}
     tls:
-      {{- toYaml .Values.fluentbit.output.es.tls | nindent 6 }}
+       {{- omit .Values.fluentbit.output.es.tls "enable" | toYaml | nindent 6 }}
     {{- end }}
 {{- end }}
 {{- end }}

charts/fluent-operator/values.yaml

@@ -284,9 +284,9 @@ fluentbit:
     #      httpPassword:
     #      logstashFormat: true
     #      replaceDots: false
-    #      enableTLS: false
     #      writeOperation: upsert
     #      tls:
+    #        enable: false
     #        verify: On
     #        debug: 1
     #        caFile: "<Absolute path to CA certificate file>"