From d4d7976b0558cf7eb3f2bbbd1d17a03273790bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sun, 27 May 2018 13:50:01 +0200 Subject: [PATCH 1/3] updated fluentd in fluentd-es-image to version 1.2.1 --- .../fluentd-es-image/Gemfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile index 93155aa4fc6..6ca3818a18b 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile @@ -1,11 +1,11 @@ source 'https://rubygems.org' -gem 'fluentd', '<=1.1.0' -gem 'activesupport', '~>5.1.4' -gem 'fluent-plugin-kubernetes_metadata_filter', '~>1.0.0' -gem 'fluent-plugin-elasticsearch', '~>2.4.1' -gem 'fluent-plugin-systemd', '~>0.3.1' -gem 'fluent-plugin-detect-exceptions', '~>0.0.9' -gem 'fluent-plugin-prometheus', '~>0.3.0' +gem 'fluentd', '<=1.2.1' +gem 'activesupport', '~>5.2.0' +gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.2' +gem 'fluent-plugin-elasticsearch', '~>2.10.1' +gem 'fluent-plugin-systemd', '~>1.0.0' +gem 'fluent-plugin-detect-exceptions', '~>0.0.11' +gem 'fluent-plugin-prometheus', '~>1.0.1' gem 'fluent-plugin-multi-format-parser', '~>1.0.0' -gem 'oj', '~>3.3.1.0' +gem 'oj', '~>3.6.0' From 1f7a61b6aa9e5b002ed9e7ede35b0c6384c2340e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sun, 27 May 2018 13:54:27 +0200 Subject: [PATCH 2/3] raised version tag to 2.1.0 --- cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index 59b9f155c2b..bb0680cc4f1 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile @@ -16,7 +16,7 @@ PREFIX = staging-k8s.gcr.io IMAGE = fluentd-elasticsearch -TAG = v2.0.4 +TAG = v2.1.0 build: docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . From 807047a792ed362b2d96b0bce97d617057fdd277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Wed, 30 May 2018 23:04:54 +0200 Subject: [PATCH 3/3] updated versions --- .../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 eecd6b4801b..c39cb5958d7 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -48,24 +48,24 @@ roleRef: apiVersion: apps/v1 kind: DaemonSet metadata: - name: fluentd-es-v2.0.4 + name: fluentd-es-v2.1.0 namespace: kube-system labels: k8s-app: fluentd-es - version: v2.0.4 + version: v2.1.0 kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile spec: selector: matchLabels: k8s-app: fluentd-es - version: v2.0.4 + version: v2.1.0 template: metadata: labels: k8s-app: fluentd-es kubernetes.io/cluster-service: "true" - version: v2.0.4 + version: v2.1.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). @@ -76,7 +76,7 @@ spec: serviceAccountName: fluentd-es containers: - name: fluentd-es - image: k8s.gcr.io/fluentd-elasticsearch:v2.0.4 + image: k8s.gcr.io/fluentd-elasticsearch:v2.1.0 env: - name: FLUENTD_ARGS value: --no-supervisor -q