From dd986ed76420ce8ac8c0315aa46476141773f1a5 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Thu, 16 Aug 2018 12:10:49 -0500
Subject: [PATCH] Fluentd: Change default image

This updates Fluentd to use the stable v1.2 debian fluentd
image instead of the kolla image. This images comes bundled
with the elasticsearch plugin, and provides more
flexibility in configuring the buffer behavior of the output
plugins

Change-Id: Id446ef1e050f5d9c005c94dae661cf9ae88fffea
---
 fluent-logging/templates/bin/_fluentd.sh.tpl     | 2 +-
 fluent-logging/templates/configmap-etc.yaml      | 2 +-
 fluent-logging/templates/deployment-fluentd.yaml | 6 +++---
 fluent-logging/values.yaml                       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fluent-logging/templates/bin/_fluentd.sh.tpl b/fluent-logging/templates/bin/_fluentd.sh.tpl
index 0450572c13..e6bfbf8666 100644
--- a/fluent-logging/templates/bin/_fluentd.sh.tpl
+++ b/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 () {
diff --git a/fluent-logging/templates/configmap-etc.yaml b/fluent-logging/templates/configmap-etc.yaml
index db109b8849..f76de40e56 100644
--- a/fluent-logging/templates/configmap-etc.yaml
+++ b/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: |
diff --git a/fluent-logging/templates/deployment-fluentd.yaml b/fluent-logging/templates/deployment-fluentd.yaml
index 9d23889357..dd7e80ab69 100644
--- a/fluent-logging/templates/deployment-fluentd.yaml
+++ b/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
diff --git a/fluent-logging/values.yaml b/fluent-logging/values.yaml
index 7848227000..2b21c4a2e9 100644
--- a/fluent-logging/values.yaml
+++ b/fluent-logging/values.yaml
@@ -35,7 +35,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