Merge pull request #95858 from monotek/fluent-es-xpack

added xpack gem to enable ilm support in fluentd-es-image

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

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

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

@@ -1,13 +1,14 @@
 source 'https://rubygems.org'
 
-gem 'activesupport', '6.0.3.3'
+gem 'activesupport', '6.0.3.4'
-gem 'fluentd', '1.11.3'
+gem 'elasticsearch-xpack', '7.9.0'
+gem 'fluentd', '1.11.4'
 gem 'fluent-plugin-concat', '2.4.0'
 gem 'fluent-plugin-detect-exceptions', '0.0.13'
-gem 'fluent-plugin-elasticsearch', '4.2.0'
+gem 'fluent-plugin-elasticsearch', '4.2.2'
 gem 'fluent-plugin-kubernetes_metadata_filter', '2.5.2'
 gem 'fluent-plugin-multi-format-parser', '1.0.0'
 gem 'fluent-plugin-prometheus', '1.8.4'
 gem 'fluent-plugin-systemd', '1.0.2'
-gem 'oj', '3.10.14'
+gem 'oj', '3.10.15'
 

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

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