Merge pull request #62166 from mbert/master

Automatic merge from submit-queue (batch tested with PRs 57954, 62166). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fluentd-elasticsearch addon: allow graceful shutdown in fluentd-es image. This PR contains an optimisation to the fluentd-elasticsearch addon. Restarting fluentd pods took unnecessarily long because the start script in the image did not support propagating signals to the actual fluentd process. This patch fixes this behaviour. ```release-note NONE ```

Merge pull request #62166 from mbert/master
0c3edc6f · Kubernetes Submit Queue · GitHub · 1416d63f · 6a79d9e6 · 0c3edc6f
Unverified Commit 0c3edc6f authored May 09, 2018 by Kubernetes Submit Queue Committed by GitHub May 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

run.sh cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh +1 -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,4 @@
 # For systems without journald
 mkdir -p /var/log/journal
-/usr/local/bin/fluentd $@
+exec /usr/local/bin/fluentd $@