From 053332ad468749f7b2d53924170dfa2372cc1c56 Mon Sep 17 00:00:00 2001
From: xichengliudui <1693291525@qq.com>
Date: Sat, 16 Feb 2019 06:09:00 -0500
Subject: [PATCH] Fix shellcheck lint errors in
 cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh

update pull request

update pull request

update pull request

update pull request

update pull request
---
 cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh | 4 ++++
 hack/.shellcheck_failures                                    | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh
index 275bc733994..18670a3bc14 100755
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh
@@ -20,4 +20,8 @@
 # For systems without journald
 mkdir -p /var/log/journal
 
+# Use exec to get the signal
+# A non-quoted string and add the comment to prevent shellcheck failures on this line.
+# See https://github.com/koalaman/shellcheck/wiki/SC2086
+# shellcheck disable=SC2086
 exec /usr/local/bin/fluentd $FLUENTD_ARGS
diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
index 6ba671b985e..1ba3f1fde73 100644
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
@@ -1,7 +1,6 @@
 ./build/lib/release.sh
 ./cluster/addons/addon-manager/kube-addons.sh
 ./cluster/addons/fluentd-elasticsearch/es-image/run.sh
-./cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh
 ./cluster/clientbin.sh
 ./cluster/common.sh
 ./cluster/gce/config-common.sh