From becbed87f12dbb3abc0b90e73be7286220dd9dbd Mon Sep 17 00:00:00 2001 From: ialidzhikov Date: Fri, 19 Apr 2019 10:14:03 +0300 Subject: [PATCH] Update gem versions Signed-off-by: ialidzhikov --- .../addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 10 +++++----- .../fluentd-elasticsearch/fluentd-es-image/Gemfile | 6 +++--- .../fluentd-elasticsearch/fluentd-es-image/Makefile | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index f39ac46f044..c341c5ffc04 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -45,22 +45,22 @@ roleRef: apiVersion: apps/v1 kind: DaemonSet metadata: - name: fluentd-es-v2.5.1 + name: fluentd-es-v2.5.2 namespace: kube-system labels: k8s-app: fluentd-es - version: v2.5.1 + version: v2.5.2 addonmanager.kubernetes.io/mode: Reconcile spec: selector: matchLabels: k8s-app: fluentd-es - version: v2.5.1 + version: v2.5.2 template: metadata: labels: k8s-app: fluentd-es - version: v2.5.1 + version: v2.5.2 # 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). @@ -72,7 +72,7 @@ spec: serviceAccountName: fluentd-es containers: - name: fluentd-es - image: gcr.io/fluentd-elasticsearch/fluentd:v2.5.1 + image: gcr.io/fluentd-elasticsearch/fluentd:v2.5.2 env: - name: FLUENTD_ARGS value: --no-supervisor -q diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile index bdb3cc020eb..e479dd31a01 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile @@ -1,12 +1,12 @@ source 'https://rubygems.org' gem 'activesupport', '~>5.2.2' -gem 'fluentd', '<=1.4.1' +gem 'fluentd', '<=1.4.2' gem 'fluent-plugin-concat', '~>2.3.0' gem 'fluent-plugin-detect-exceptions', '~>0.0.12' -gem 'fluent-plugin-elasticsearch', '~>3.3.3' +gem 'fluent-plugin-elasticsearch', '~>3.4.3' gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.6' gem 'fluent-plugin-multi-format-parser', '~>1.0.0' gem 'fluent-plugin-prometheus', '~>1.3.0' gem 'fluent-plugin-systemd', '~>1.0.2' -gem 'oj', '~>3.7.9' +gem 'oj', '~>3.7.12' diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index 61efd46ab88..62d89dbd30f 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile @@ -16,7 +16,7 @@ PREFIX = gcr.io/fluentd-elasticsearch IMAGE = fluentd -TAG = v2.5.1 +TAG = v2.5.2 build: gcloud builds submit --tag $(PREFIX)/$(IMAGE):$(TAG)