Merge "Fluentd: Change default image"

fluent-logging/templates/bin/_fluentd.sh.tpl

@@ -20,7 +20,7 @@ set -ex
 COMMAND="${@:-start}"
 
 function start () {
-  exec /usr/sbin/td-agent
+  exec fluentd -c /fluentd/etc/fluent.conf
 }
 
 function stop () {

fluent-logging/templates/configmap-etc.yaml

@@ -26,7 +26,7 @@ data:
 {{ include "fluent_logging.utils.to_fluentbit_conf" .Values.conf.fluentbit | indent 4 }}
   parsers.conf: |
 {{ include "fluent_logging.utils.to_fluentbit_conf" .Values.conf.parsers | indent 4 }}
-  td-agent.conf: |
+  fluent.conf: |
 {{ include "fluent_logging.utils.to_fluentd_conf" .Values.conf.td_agent | indent 4 }}
 {{ range $template, $fields := .Values.conf.templates }}
   {{ $template }}.json: |

fluent-logging/templates/deployment-fluentd.yaml

@@ -136,10 +136,10 @@ spec:
                   key: ELASTICSEARCH_PASSWORD
           volumeMounts:
             - name: pod-etc-fluentd
-              mountPath: /etc/td-agent
+              mountPath: /fluentd/etc
             - name: fluent-logging-etc
-              mountPath: /etc/td-agent/td-agent.conf
-              subPath: td-agent.conf
+              mountPath: /fluentd/etc/fluent.conf
+              subPath: fluent.conf
               readOnly: true
             - name: fluent-logging-bin
               mountPath: /tmp/fluentd.sh

fluent-logging/values.yaml

@@ -37,7 +37,7 @@ labels:
 images:
   tags:
     fluentbit: docker.io/fluent/fluent-bit:0.12.14
-    fluentd: docker.io/kolla/ubuntu-source-fluentd:ocata
+    fluentd: docker.io/fluent/fluentd-kubernetes-daemonset:v1.2-debian-elasticsearch
     prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
     helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3