Merge pull request #95271 from monotek/fluentd1113

updates fluentd docker image and all plugins

cluster/addons/fluentd-elasticsearch/README.md

@@ -87,10 +87,4 @@ are a starting point and should not be considered to be production ready.
 If you like to run these tools in a production environment you could use the
 [Helm](https://helm.sh) charts, provided by the Helm community, which are used
 by a lot of people and therefore are widely tested. You can find them all via the
-[Helm Hub](https://hub.helm.sh/).
-
-The source of the mentioned charts can be found here:
-
-* [Elasticsearch](https://github.com/helm/charts/tree/master/stable/elasticsearch)
-* [Fluentd-elasticsearch](https://github.com/kiwigrid/helm-charts/tree/master/charts/fluentd-elasticsearch)
-* [Kibana](https://github.com/helm/charts/tree/master/stable/kibana)
+[Helm Hub](https://hub.helm.sh/) or the [Artifact hub](https://artifacthub.io/).

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

@@ -45,22 +45,22 @@ roleRef:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: fluentd-es-v3.0.2
+  name: fluentd-es-v3.0.5
   namespace: kube-system
   labels:
     k8s-app: fluentd-es
-    version: v3.0.2
+    version: v3.0.5
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   selector:
     matchLabels:
       k8s-app: fluentd-es
-      version: v3.0.2
+      version: v3.0.5
   template:
     metadata:
       labels:
         k8s-app: fluentd-es
-        version: v3.0.2
+        version: v3.0.5
     spec:
       securityContext:
         seccompProfile:
@@ -69,7 +69,7 @@ spec:
       serviceAccountName: fluentd-es
       containers:
       - name: fluentd-es
-        image: quay.io/fluentd_elasticsearch/fluentd:v3.0.2
+        image: quay.io/fluentd_elasticsearch/fluentd:v3.0.5
         env:
         - name: FLUENTD_ARGS
           value: --no-supervisor -q

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

@@ -1,12 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'activesupport', '6.0.3.2'
-gem 'fluentd', '1.11.1'
+gem 'activesupport', '6.0.3.3'
+gem 'fluentd', '1.11.3'
 gem 'fluent-plugin-concat', '2.4.0'
 gem 'fluent-plugin-detect-exceptions', '0.0.13'
-gem 'fluent-plugin-elasticsearch', '4.1.0'
+gem 'fluent-plugin-elasticsearch', '4.2.0'
 gem 'fluent-plugin-kubernetes_metadata_filter', '2.5.2'
 gem 'fluent-plugin-multi-format-parser', '1.0.0'
-gem 'fluent-plugin-prometheus', '1.8.2'
+gem 'fluent-plugin-prometheus', '1.8.4'
 gem 'fluent-plugin-systemd', '1.0.2'
-gem 'oj', '3.10.7'
+gem 'oj', '3.10.14'
+

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

@@ -16,7 +16,7 @@
 
 PREFIX = quay.io/fluentd_elasticsearch
 IMAGE = fluentd
-TAG = v3.0.4
+TAG = v3.0.5
 
 build:
 	docker build --tag ${PREFIX}/${IMAGE}:${TAG} .