Merge pull request #74187 from xichengliudui/fixgolint0218

Fix shellcheck lint errors in cluster/addons/fluentd-elasticsearch/fl……uentd-es-image/run.sh

Merge pull request #74187 from xichengliudui/fixgolint0218
125dc6c8 · Kubernetes Prow Robot · GitHub · 9fcbf02d · 053332ad · 125dc6c8
Unverified Commit 125dc6c8 authored Feb 21, 2019 by Kubernetes Prow Robot Committed by GitHub Feb 21, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

run.sh cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh +4 -0

.shellcheck_failures hack/.shellcheck_failures +0 -1

No files found.
--- 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
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
 ./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