Skip to content

Commit 5669014

Browse files
authored
Merge pull request kubernetes#76854 from ialidzhikov/update-images
Update gem versions
2 parents a245408 + becbed8 commit 5669014

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
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-v2.5.1
48+
name: fluentd-es-v2.5.2
4949
namespace: kube-system
5050
labels:
5151
k8s-app: fluentd-es
52-
version: v2.5.1
52+
version: v2.5.2
5353
addonmanager.kubernetes.io/mode: Reconcile
5454
spec:
5555
selector:
5656
matchLabels:
5757
k8s-app: fluentd-es
58-
version: v2.5.1
58+
version: v2.5.2
5959
template:
6060
metadata:
6161
labels:
6262
k8s-app: fluentd-es
63-
version: v2.5.1
63+
version: v2.5.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).
@@ -72,7 +72,7 @@ spec:
7272
serviceAccountName: fluentd-es
7373
containers:
7474
- name: fluentd-es
75-
image: gcr.io/fluentd-elasticsearch/fluentd:v2.5.1
75+
image: gcr.io/fluentd-elasticsearch/fluentd:v2.5.2
7676
env:
7777
- name: FLUENTD_ARGS
7878
value: --no-supervisor -q
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
source 'https://rubygems.org'
22

33
gem 'activesupport', '~>5.2.2'
4-
gem 'fluentd', '<=1.4.1'
4+
gem 'fluentd', '<=1.4.2'
55
gem 'fluent-plugin-concat', '~>2.3.0'
66
gem 'fluent-plugin-detect-exceptions', '~>0.0.12'
7-
gem 'fluent-plugin-elasticsearch', '~>3.3.3'
7+
gem 'fluent-plugin-elasticsearch', '~>3.4.3'
88
gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.6'
99
gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
1010
gem 'fluent-plugin-prometheus', '~>1.3.0'
1111
gem 'fluent-plugin-systemd', '~>1.0.2'
12-
gem 'oj', '~>3.7.9'
12+
gem 'oj', '~>3.7.12'

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 = gcr.io/fluentd-elasticsearch
1818
IMAGE = fluentd
19-
TAG = v2.5.1
19+
TAG = v2.5.2
2020

2121
build:
2222
gcloud builds submit --tag $(PREFIX)/$(IMAGE):$(TAG)

0 commit comments

Comments
 (0)