diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index bd3fc039bf1..c01b90b82ba 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -48,24 +48,24 @@ roleRef: apiVersion: apps/v1 kind: DaemonSet metadata: - name: fluentd-es-v2.1.0 + name: fluentd-es-v2.2.0 namespace: kube-system labels: k8s-app: fluentd-es - version: v2.1.0 + version: v2.2.0 kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile spec: selector: matchLabels: k8s-app: fluentd-es - version: v2.1.0 + version: v2.2.0 template: metadata: labels: k8s-app: fluentd-es kubernetes.io/cluster-service: "true" - version: v2.1.0 + version: v2.2.0 # 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.1.0 + image: k8s.gcr.io/fluentd-elasticsearch:v2.2.0 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 f97ad5fadb4..dae30ddbbd7 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile @@ -1,11 +1,11 @@ source 'https://rubygems.org' -gem 'fluentd', '~>1.1.3' -gem 'activesupport', '~>5.1.4' -gem 'fluent-plugin-kubernetes_metadata_filter', '~>1.0.0' -gem 'fluent-plugin-elasticsearch', '~>2.9.1' -gem 'fluent-plugin-systemd', '~>0.3.1' -gem 'fluent-plugin-detect-exceptions', '~>0.0.9' -gem 'fluent-plugin-prometheus', '~>0.3.0' +gem 'fluentd', '<=1.2.2' +gem 'activesupport', '~>5.2.0' +gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.2' +gem 'fluent-plugin-elasticsearch', '~>2.10.5' +gem 'fluent-plugin-systemd', '~>1.0.1' +gem 'fluent-plugin-detect-exceptions', '~>0.0.11' +gem 'fluent-plugin-prometheus', '~>1.0.1' gem 'fluent-plugin-multi-format-parser', '~>1.0.0' -gem 'oj', '~>3.3.1.0' +gem 'oj', '~>3.6.2' diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index bb0680cc4f1..55e54881faa 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile @@ -16,7 +16,7 @@ PREFIX = staging-k8s.gcr.io IMAGE = fluentd-elasticsearch -TAG = v2.1.0 +TAG = v2.2.0 build: docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .