mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #91581 from monotek/fluentd-metadatafilter-fix
[fluentd] update gemfile to fix metadata plugin bug
This commit is contained in:
commit
5de465e67d
@ -45,22 +45,22 @@ roleRef:
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
name: fluentd-es-v3.0.1
|
||||
name: fluentd-es-v3.0.2
|
||||
namespace: kube-system
|
||||
labels:
|
||||
k8s-app: fluentd-es
|
||||
version: v3.0.1
|
||||
version: v3.0.2
|
||||
addonmanager.kubernetes.io/mode: Reconcile
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
k8s-app: fluentd-es
|
||||
version: v3.0.1
|
||||
version: v3.0.2
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
k8s-app: fluentd-es
|
||||
version: v3.0.1
|
||||
version: v3.0.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).
|
||||
@ -71,7 +71,7 @@ spec:
|
||||
serviceAccountName: fluentd-es
|
||||
containers:
|
||||
- name: fluentd-es
|
||||
image: quay.io/fluentd_elasticsearch/fluentd:v3.0.1
|
||||
image: quay.io/fluentd_elasticsearch/fluentd:v3.0.2
|
||||
env:
|
||||
- name: FLUENTD_ARGS
|
||||
value: --no-supervisor -q
|
||||
|
@ -1,12 +1,12 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'activesupport', '6.0.2.2'
|
||||
gem 'activesupport', '6.0.3.1'
|
||||
gem 'fluentd', '1.9.3'
|
||||
gem 'fluent-plugin-concat', '2.4.0'
|
||||
gem 'fluent-plugin-detect-exceptions', '0.0.13'
|
||||
gem 'fluent-plugin-elasticsearch', '4.0.7'
|
||||
gem 'fluent-plugin-kubernetes_metadata_filter', '2.4.5'
|
||||
gem 'fluent-plugin-elasticsearch', '4.0.9'
|
||||
gem 'fluent-plugin-kubernetes_metadata_filter', '2.4.6'
|
||||
gem 'fluent-plugin-multi-format-parser', '1.0.0'
|
||||
gem 'fluent-plugin-prometheus', '1.7.3'
|
||||
gem 'fluent-plugin-prometheus', '1.8.0'
|
||||
gem 'fluent-plugin-systemd', '1.0.2'
|
||||
gem 'oj', '3.10.5'
|
||||
gem 'oj', '3.10.6'
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
PREFIX = quay.io/fluentd_elasticsearch
|
||||
IMAGE = fluentd
|
||||
TAG = v3.0.1
|
||||
TAG = v3.0.2
|
||||
|
||||
build:
|
||||
docker build --tag ${PREFIX}/${IMAGE}:${TAG} .
|
||||
|
Loading…
Reference in New Issue
Block a user