Skip to content

Commit 5de465e

Browse files
authored
Merge pull request kubernetes#91581 from monotek/fluentd-metadatafilter-fix
[fluentd] update gemfile to fix metadata plugin bug
2 parents b8b4186 + 7433364 commit 5de465e

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

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.1
48+
name: fluentd-es-v3.0.2
4949
namespace: kube-system
5050
labels:
5151
k8s-app: fluentd-es
52-
version: v3.0.1
52+
version: v3.0.2
5353
addonmanager.kubernetes.io/mode: Reconcile
5454
spec:
5555
selector:
5656
matchLabels:
5757
k8s-app: fluentd-es
58-
version: v3.0.1
58+
version: v3.0.2
5959
template:
6060
metadata:
6161
labels:
6262
k8s-app: fluentd-es
63-
version: v3.0.1
63+
version: v3.0.2
6464
# This annotation ensures that fluentd does not get evicted if the node
6565
# supports critical pod annotation based priority scheme.
6666
# Note that this does not guarantee admission on the nodes (#40573).
@@ -71,7 +71,7 @@ spec:
7171
serviceAccountName: fluentd-es
7272
containers:
7373
- name: fluentd-es
74-
image: quay.io/fluentd_elasticsearch/fluentd:v3.0.1
74+
image: quay.io/fluentd_elasticsearch/fluentd:v3.0.2
7575
env:
7676
- name: FLUENTD_ARGS
7777
value: --no-supervisor -q
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
source 'https://rubygems.org'
22

3-
gem 'activesupport', '6.0.2.2'
3+
gem 'activesupport', '6.0.3.1'
44
gem 'fluentd', '1.9.3'
55
gem 'fluent-plugin-concat', '2.4.0'
66
gem 'fluent-plugin-detect-exceptions', '0.0.13'
7-
gem 'fluent-plugin-elasticsearch', '4.0.7'
8-
gem 'fluent-plugin-kubernetes_metadata_filter', '2.4.5'
7+
gem 'fluent-plugin-elasticsearch', '4.0.9'
8+
gem 'fluent-plugin-kubernetes_metadata_filter', '2.4.6'
99
gem 'fluent-plugin-multi-format-parser', '1.0.0'
10-
gem 'fluent-plugin-prometheus', '1.7.3'
10+
gem 'fluent-plugin-prometheus', '1.8.0'
1111
gem 'fluent-plugin-systemd', '1.0.2'
12-
gem 'oj', '3.10.5'
12+
gem 'oj', '3.10.6'

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.1
19+
TAG = v3.0.2
2020

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

0 commit comments

Comments
 (0)