From 1d1c1267834cbcce5a8bf3d37938d841c1137898 Mon Sep 17 00:00:00 2001
From: Mik Vyatskov <vmik@google.com>
Date: Wed, 21 Jun 2017 20:14:43 +0200
Subject: [PATCH] Make fluentd log to stdio instead of a dedicated file

---
 cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 5 ++++-
 cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml          | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
index 769d384286a..caf82523173 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
@@ -27,7 +27,10 @@ spec:
         command:
           - '/bin/sh'
           - '-c'
-          - '/usr/sbin/td-agent 2>&1 >> /var/log/fluentd.log'
+          - '/usr/sbin/td-agent $FLUENTD_ARGS'
+        env:
+        - name: FLUENTD_AGRS
+          value: -q
         resources:
           limits:
             memory: 200Mi
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
index 82e1211d7f0..ebde46a50cc 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -36,10 +36,10 @@ spec:
         command:
           - '/bin/sh'
           - '-c'
-          - '/run.sh $FLUENTD_ARGS 2>&1 >>/var/log/fluentd.log'
+          - '/run.sh $FLUENTD_ARGS'
         env:
         - name: FLUENTD_ARGS
-          value: --no-supervisor
+          value: --no-supervisor -q
         resources:
           limits:
             memory: 300Mi