mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #80912 from monotek/fluentd-elasticsearch
[fluentd/elasticsearch] updated fluentd to 1.6.3
This commit is contained in:
commit
6789f38199
@ -45,22 +45,22 @@ roleRef:
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
name: fluentd-es-v2.6.0
|
||||
name: fluentd-es-v2.7.0
|
||||
namespace: kube-system
|
||||
labels:
|
||||
k8s-app: fluentd-es
|
||||
version: v2.6.0
|
||||
version: v2.7.0
|
||||
addonmanager.kubernetes.io/mode: Reconcile
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
k8s-app: fluentd-es
|
||||
version: v2.6.0
|
||||
version: v2.7.0
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
k8s-app: fluentd-es
|
||||
version: v2.6.0
|
||||
version: v2.7.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).
|
||||
@ -71,7 +71,7 @@ spec:
|
||||
serviceAccountName: fluentd-es
|
||||
containers:
|
||||
- name: fluentd-es
|
||||
image: quay.io/fluentd_elasticsearch/fluentd:v2.6.0
|
||||
image: quay.io/fluentd_elasticsearch/fluentd:v2.7.0
|
||||
env:
|
||||
- name: FLUENTD_ARGS
|
||||
value: --no-supervisor -q
|
||||
|
@ -1,12 +1,12 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'activesupport', '~>5.2.3'
|
||||
gem 'fluentd', '<=1.5.1'
|
||||
gem 'fluent-plugin-concat', '~>2.3.0'
|
||||
gem 'fluentd', '<=1.6.3'
|
||||
gem 'fluent-plugin-concat', '~>2.4.0'
|
||||
gem 'fluent-plugin-detect-exceptions', '~>0.0.12'
|
||||
gem 'fluent-plugin-elasticsearch', '~>3.5.2'
|
||||
gem 'fluent-plugin-elasticsearch', '~>3.5.3'
|
||||
gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.2.0'
|
||||
gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
|
||||
gem 'fluent-plugin-prometheus', '~>1.4.0'
|
||||
gem 'fluent-plugin-systemd', '~>1.0.2'
|
||||
gem 'oj', '~>3.7.12'
|
||||
gem 'oj', '~>3.8.1'
|
||||
|
@ -16,12 +16,12 @@
|
||||
|
||||
PREFIX = quay.io/fluentd_elasticsearch
|
||||
IMAGE = fluentd
|
||||
TAG = v2.6.0
|
||||
TAG = v2.7.0
|
||||
|
||||
build:
|
||||
docker build --tag ${PREFIX}/${IMAGE}:${TAG} .
|
||||
docker build --tag ${PREFIX}/${IMAGE}:${TAG} .
|
||||
docker build --tag ${PREFIX}/${IMAGE}:latest .
|
||||
|
||||
push:
|
||||
docker push ${PREFIX}/${IMAGE}:${TAG}
|
||||
docker push ${PREFIX}/${IMAGE}:latest
|
||||
|
Loading…
Reference in New Issue
Block a user