Merge pull request #75967 from ialidzhikov/fluentd-1.4.1

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

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

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

 source 'https://rubygems.org'
 
 gem 'activesupport', '~>5.2.2'
-gem 'fluentd', '<=1.4.0'
+gem 'fluentd', '<=1.4.1'
 gem 'fluent-plugin-concat', '~>2.3.0'
 gem 'fluent-plugin-detect-exceptions', '~>0.0.12'
 gem 'fluent-plugin-elasticsearch', '~>3.3.3'

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

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

cluster/addons/fluentd-elasticsearch/fluentd-es-image/README.md

@@ -4,11 +4,11 @@ that collects Docker container log files using [Fluentd][fluentd]
 and sends them to an instance of [Elasticsearch][elasticsearch].
 This image is designed to be used as part of the [Kubernetes][kubernetes]
 cluster bring up process. The image resides at GCR under the name
-[k8s.gcr.io/fluentd-elasticsearch][image].
+[gcr.io/fluentd-elasticsearch/fluentd][image].
 
 [fluentd]: http://www.fluentd.org/
 [elasticsearch]: https://www.elastic.co/products/elasticsearch
 [kubernetes]: https://kubernetes.io
-[image]: https://k8s.gcr.io/fluentd-elasticsearch
+[image]: https://gcr.io/fluentd-elasticsearch/fluentd
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/fluentd-elasticsearch/fluentd-es-image/README.md?pixel)]()