From 335bfe091131ea1024351095d8437772d02ff2d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?=
 <cdesaintmartin@wiremind.fr>
Date: Tue, 24 Mar 2020 08:51:13 +0100
Subject: [PATCH] cluster add-ons: fluentd: update gems.

In particular, update fluent-plugin-kubernetes_metadata_filter to 2.4.5 to solve a potential high apiserver request count.
---
 .../addons/fluentd-elasticsearch/fluentd-es-ds.yaml    | 10 +++++-----
 .../fluentd-elasticsearch/fluentd-es-image/Gemfile     |  8 ++++----
 .../fluentd-elasticsearch/fluentd-es-image/Makefile    |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
index f83260d2c83..d2591f4cd07 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-v3.0.0
+  name: fluentd-es-v3.0.1
   namespace: kube-system
   labels:
     k8s-app: fluentd-es
-    version: v3.0.0
+    version: v3.0.1
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   selector:
     matchLabels:
       k8s-app: fluentd-es
-      version: v3.0.0
+      version: v3.0.1
   template:
     metadata:
       labels:
         k8s-app: fluentd-es
-        version: v3.0.0
+        version: v3.0.1
       # 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).
@@ -71,7 +71,7 @@ spec:
       serviceAccountName: fluentd-es
       containers:
       - name: fluentd-es
-        image: quay.io/fluentd_elasticsearch/fluentd:v3.0.0
+        image: quay.io/fluentd_elasticsearch/fluentd:v3.0.1
         env:
         - name: FLUENTD_ARGS
           value: --no-supervisor -q
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
index 33f567997ad..1f77fa71d80 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 'activesupport', '6.0.2.1'
-gem 'fluentd', '1.9.2'
+gem 'activesupport', '6.0.2.2'
+gem 'fluentd', '1.9.3'
 gem 'fluent-plugin-concat', '2.4.0'
 gem 'fluent-plugin-detect-exceptions', '0.0.13'
-gem 'fluent-plugin-elasticsearch', '4.0.5'
-gem 'fluent-plugin-kubernetes_metadata_filter', '2.4.2'
+gem 'fluent-plugin-elasticsearch', '4.0.7'
+gem 'fluent-plugin-kubernetes_metadata_filter', '2.4.5'
 gem 'fluent-plugin-multi-format-parser', '1.0.0'
 gem 'fluent-plugin-prometheus', '1.7.3'
 gem 'fluent-plugin-systemd', '1.0.2'
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index aad4b402daa..663e1b96148 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 = v3.0.0
+TAG = v3.0.1
 
 build:
 	docker build --tag ${PREFIX}/${IMAGE}:${TAG} .