Skip to content

Commit 0ef3707

Browse files
authored
Merge pull request kubernetes#95271 from monotek/fluentd1113
updates fluentd docker image and all plugins
2 parents 9f0a783 + ba83b77 commit 0ef3707

File tree

4 files changed

+13
-18
lines changed

4 files changed

+13
-18
lines changed

cluster/addons/fluentd-elasticsearch/README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,4 @@ are a starting point and should not be considered to be production ready.
8787
If you like to run these tools in a production environment you could use the
8888
[Helm](https://helm.sh) charts, provided by the Helm community, which are used
8989
by a lot of people and therefore are widely tested. You can find them all via the
90-
[Helm Hub](https://hub.helm.sh/).
91-
92-
The source of the mentioned charts can be found here:
93-
94-
* [Elasticsearch](https://github.com/helm/charts/tree/master/stable/elasticsearch)
95-
* [Fluentd-elasticsearch](https://github.com/kiwigrid/helm-charts/tree/master/charts/fluentd-elasticsearch)
96-
* [Kibana](https://github.com/helm/charts/tree/master/stable/kibana)
90+
[Helm Hub](https://hub.helm.sh/) or the [Artifact hub](https://artifacthub.io/).

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,22 @@ roleRef:
4545
apiVersion: apps/v1
4646
kind: DaemonSet
4747
metadata:
48-
name: fluentd-es-v3.0.2
48+
name: fluentd-es-v3.0.5
4949
namespace: kube-system
5050
labels:
5151
k8s-app: fluentd-es
52-
version: v3.0.2
52+
version: v3.0.5
5353
addonmanager.kubernetes.io/mode: Reconcile
5454
spec:
5555
selector:
5656
matchLabels:
5757
k8s-app: fluentd-es
58-
version: v3.0.2
58+
version: v3.0.5
5959
template:
6060
metadata:
6161
labels:
6262
k8s-app: fluentd-es
63-
version: v3.0.2
63+
version: v3.0.5
6464
spec:
6565
securityContext:
6666
seccompProfile:
@@ -69,7 +69,7 @@ spec:
6969
serviceAccountName: fluentd-es
7070
containers:
7171
- name: fluentd-es
72-
image: quay.io/fluentd_elasticsearch/fluentd:v3.0.2
72+
image: quay.io/fluentd_elasticsearch/fluentd:v3.0.5
7373
env:
7474
- name: FLUENTD_ARGS
7575
value: --no-supervisor -q
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
source 'https://rubygems.org'
22

3-
gem 'activesupport', '6.0.3.2'
4-
gem 'fluentd', '1.11.1'
3+
gem 'activesupport', '6.0.3.3'
4+
gem 'fluentd', '1.11.3'
55
gem 'fluent-plugin-concat', '2.4.0'
66
gem 'fluent-plugin-detect-exceptions', '0.0.13'
7-
gem 'fluent-plugin-elasticsearch', '4.1.0'
7+
gem 'fluent-plugin-elasticsearch', '4.2.0'
88
gem 'fluent-plugin-kubernetes_metadata_filter', '2.5.2'
99
gem 'fluent-plugin-multi-format-parser', '1.0.0'
10-
gem 'fluent-plugin-prometheus', '1.8.2'
10+
gem 'fluent-plugin-prometheus', '1.8.4'
1111
gem 'fluent-plugin-systemd', '1.0.2'
12-
gem 'oj', '3.10.7'
12+
gem 'oj', '3.10.14'
13+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
PREFIX = quay.io/fluentd_elasticsearch
1818
IMAGE = fluentd
19-
TAG = v3.0.4
19+
TAG = v3.0.5
2020

2121
build:
2222
docker build --tag ${PREFIX}/${IMAGE}:${TAG} .

0 commit comments

Comments
 (0)