From ca9424dd2a981fcd5956b96b868ec75684fb198f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 2 Aug 2019 16:05:15 +0200 Subject: [PATCH 1/4] updated fluentd to 1.6.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- .../addons/fluentd-elasticsearch/fluentd-es-image/Gemfile | 8 ++++---- .../fluentd-elasticsearch/fluentd-es-image/Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile index e2a7394ca2a..c813ffa2d6f 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', '~>5.2.3' -gem 'fluentd', '<=1.5.1' -gem 'fluent-plugin-concat', '~>2.3.0' +gem 'fluentd', '<=1.6.3' +gem 'fluent-plugin-concat', '~>2.4.0' gem 'fluent-plugin-detect-exceptions', '~>0.0.12' -gem 'fluent-plugin-elasticsearch', '~>3.5.2' +gem 'fluent-plugin-elasticsearch', '~>3.5.3' gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.2.0' gem 'fluent-plugin-multi-format-parser', '~>1.0.0' gem 'fluent-plugin-prometheus', '~>1.4.0' gem 'fluent-plugin-systemd', '~>1.0.2' -gem 'oj', '~>3.7.12' +gem 'oj', '~>3.8.1' diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index 91bfde6539e..79ce97b4480 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.6.0 +TAG = v2.7.0 build: docker build --tag ${PREFIX}/${IMAGE}:${TAG} . From 596328de411ad63040c03f6f59236212cc2ff8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 2 Aug 2019 16:32:31 +0200 Subject: [PATCH 2/4] fixed whitespaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index 79ce97b4480..190ff97f945 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile @@ -19,9 +19,8 @@ IMAGE = fluentd TAG = v2.7.0 build: - docker build --tag ${PREFIX}/${IMAGE}:${TAG} . + docker build --tag ${PREFIX}/${IMAGE}:${TAG} . push: docker push ${PREFIX}/${IMAGE}:${TAG} docker push ${PREFIX}/${IMAGE}:latest - \ No newline at end of file From bb51318a07e640fec37deb79d897942efe47f876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 2 Aug 2019 16:34:45 +0200 Subject: [PATCH 3/4] added latest tag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index 190ff97f945..74d9bcedb56 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile @@ -20,6 +20,7 @@ TAG = v2.7.0 build: docker build --tag ${PREFIX}/${IMAGE}:${TAG} . + docker build --tag ${PREFIX}/${IMAGE}:latest . push: docker push ${PREFIX}/${IMAGE}:${TAG} From 8cda6da27d270d8dff31731519330f299963e9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 13 Aug 2019 19:45:52 +0200 Subject: [PATCH 4/4] use image in statefulset too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- .../addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index 047133466e7..92e4656cf7c 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -45,22 +45,22 @@ roleRef: apiVersion: apps/v1 kind: DaemonSet metadata: - name: fluentd-es-v2.6.0 + name: fluentd-es-v2.7.0 namespace: kube-system labels: k8s-app: fluentd-es - version: v2.6.0 + version: v2.7.0 addonmanager.kubernetes.io/mode: Reconcile spec: selector: matchLabels: k8s-app: fluentd-es - version: v2.6.0 + version: v2.7.0 template: metadata: labels: k8s-app: fluentd-es - version: v2.6.0 + version: v2.7.0 # This annotation ensures that fluentd does not get evicted if the node # supports critical pod annotation based priority scheme. # Note that this does not guarantee admission on the nodes (#40573). @@ -72,7 +72,7 @@ spec: serviceAccountName: fluentd-es containers: - name: fluentd-es - image: quay.io/fluentd_elasticsearch/fluentd:v2.6.0 + image: quay.io/fluentd_elasticsearch/fluentd:v2.7.0 env: - name: FLUENTD_ARGS value: --no-supervisor -q