From f2adf33bc8aac4ecb9c3233db5f7a5d788ec99a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <monotek23@gmail.com>
Date: Thu, 19 Dec 2019 14:33:16 +0100
Subject: [PATCH] update fluentd to 1.8.0 / fixed gemfile / fixed shellcheck
 lint problems by using xarg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: André Bauer <monotek23@gmail.com>
---
 .../fluentd-es-image/Gemfile                  | 20 +++++++++----------
 .../fluentd-es-image/Makefile                 |  2 +-
 .../fluentd-es-image/install.sh               |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
index b9b79ebdee2..d12cfdffbdc 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
 
-gem 'activesupport', '~>6.0.1'
-gem 'fluentd', '<=1.7.4'
-gem 'fluent-plugin-concat', '~>2.4.0'
-gem 'fluent-plugin-detect-exceptions', '~>0.0.13'
-gem 'fluent-plugin-elasticsearch', '~>3.7.1'
-gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.4.0'
-gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
-gem 'fluent-plugin-prometheus', '~>1.7.0'
-gem 'fluent-plugin-systemd', '~>1.0.2'
-gem 'oj', '~>3.10.0'
+gem 'activesupport', '6.0.2.1'
+gem 'fluentd', '1.8.0'
+gem 'fluent-plugin-concat', '2.4.0'
+gem 'fluent-plugin-detect-exceptions', '0.0.13'
+gem 'fluent-plugin-elasticsearch', '3.8.0'
+gem 'fluent-plugin-kubernetes_metadata_filter', '2.4.1'
+gem 'fluent-plugin-multi-format-parser', '1.0.0'
+gem 'fluent-plugin-prometheus', '1.7.0'
+gem 'fluent-plugin-systemd', '1.0.2'
+gem 'oj', '3.10.0'
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index dc8da73b946..897b516c402 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -16,7 +16,7 @@
 
 PREFIX = quay.io/fluentd_elasticsearch
 IMAGE = fluentd
-TAG = v2.8.0
+TAG = v2.9.0
 
 build:
 	docker build --tag ${PREFIX}/${IMAGE}:${TAG} .
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/install.sh b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/install.sh
index 0d4baa5b20d..3a4bed796a7 100755
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/install.sh
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/install.sh
@@ -28,14 +28,14 @@ BUILD_DEPS="make gcc g++ libc6-dev ruby-dev libffi-dev"
 
 # apt install
 apt-get update
-apt-get install -y --no-install-recommends "${BUILD_DEPS}" ca-certificates libjemalloc2 ruby
+echo "${BUILD_DEPS} ca-certificates libjemalloc2 ruby" | xargs apt-get install -y --no-install-recommends
 
 # ruby install
 echo 'gem: --no-document' >> /etc/gemrc 
 gem install --file Gemfile
 
 # cleanup
-apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false "${BUILD_DEPS}"
+echo "${BUILD_DEPS}" | xargs apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
 apt-get clean -y
 rm -rf \
    /var/cache/debconf/* \