Merge pull request #74616 from ialidzhikov/fluentd-1.4.0

Update fluentd to 1.4.0

cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml

@@ -48,24 +48,24 @@ roleRef:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: fluentd-es-v2.4.0
+  name: fluentd-es-v2.5.0
   namespace: kube-system
   labels:
     k8s-app: fluentd-es
-    version: v2.4.0
+    version: v2.5.0
     kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   selector:
     matchLabels:
       k8s-app: fluentd-es
-      version: v2.4.0
+      version: v2.5.0
   template:
     metadata:
       labels:
         k8s-app: fluentd-es
         kubernetes.io/cluster-service: "true"
-        version: v2.4.0
+        version: v2.5.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).
@@ -77,7 +77,7 @@ spec:
       serviceAccountName: fluentd-es
       containers:
       - name: fluentd-es
-        image: k8s.gcr.io/fluentd-elasticsearch:v2.4.0
+        image: k8s.gcr.io/fluentd-elasticsearch:v2.5.0
         env:
         - name: FLUENTD_ARGS
           value: --no-supervisor -q

cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile

@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
 
 gem 'activesupport', '~>5.2.2'
-gem 'fluentd', '<=1.3.3'
+gem 'fluentd', '<=1.4.0'
 gem 'fluent-plugin-concat', '~>2.3.0'
-gem 'fluent-plugin-detect-exceptions', '~>0.0.11'
-gem 'fluent-plugin-elasticsearch', '~>3.0.1'
+gem 'fluent-plugin-detect-exceptions', '~>0.0.12'
+gem 'fluent-plugin-elasticsearch', '~>3.3.3'
 gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.6'
 gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
 gem 'fluent-plugin-prometheus', '~>1.3.0'
-gem 'fluent-plugin-systemd', '~>1.0.1'
-gem 'oj', '~>3.7.6'
+gem 'fluent-plugin-systemd', '~>1.0.2'
+gem 'oj', '~>3.7.9'

cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile

@@ -16,7 +16,7 @@
 
 PREFIX = gcr.io/fluentd-elasticsearch
 IMAGE = fluentd
-TAG = v2.4.0
+TAG = v2.5.0
 
 build:
 	gcloud builds submit --tag $(PREFIX)/$(IMAGE):$(TAG)