github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80912 from monotek/fluentd-elasticsearch

Browse Source 
[fluentd/elasticsearch] updated fluentd to 1.6.3
This commit is contained in:
Kubernetes Prow Robot 2019-08-20 23:05:16 -07:00 committed by GitHub
commit 6789f38199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
View File

@ -45,22 +45,22 @@ roleRef:
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-es-v2.6.0 name: fluentd-es-v2.7.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v2.6.0 version: v2.7.0
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v2.6.0 version: v2.7.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v2.6.0 version: v2.7.0
# This annotation ensures that fluentd does not get evicted if the node # This annotation ensures that fluentd does not get evicted if the node
# supports critical pod annotation based priority scheme. # supports critical pod annotation based priority scheme.
# Note that this does not guarantee admission on the nodes (#40573). # Note that this does not guarantee admission on the nodes (#40573).
@ -71,7 +71,7 @@ spec:
serviceAccountName: fluentd-es serviceAccountName: fluentd-es
containers: containers:
- name: fluentd-es - name: fluentd-es
image: quay.io/fluentd_elasticsearch/fluentd:v2.6.0 image: quay.io/fluentd_elasticsearch/fluentd:v2.7.0
env: env:
- name: FLUENTD_ARGS - name: FLUENTD_ARGS
value: --no-supervisor -q value: --no-supervisor -q

8
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
View File

@ -1,12 +1,12 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'activesupport', '~>5.2.3' gem 'activesupport', '~>5.2.3'
gem 'fluentd', '<=1.5.1' gem 'fluentd', '<=1.6.3'
gem 'fluent-plugin-concat', '~>2.3.0' gem 'fluent-plugin-concat', '~>2.4.0'
gem 'fluent-plugin-detect-exceptions', '~>0.0.12' 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-kubernetes_metadata_filter', '~>2.2.0'
gem 'fluent-plugin-multi-format-parser', '~>1.0.0' gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
gem 'fluent-plugin-prometheus', '~>1.4.0' gem 'fluent-plugin-prometheus', '~>1.4.0'
gem 'fluent-plugin-systemd', '~>1.0.2' gem 'fluent-plugin-systemd', '~>1.0.2'
gem 'oj', '~>3.7.12' gem 'oj', '~>3.8.1'

6
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@ -16,12 +16,12 @@
PREFIX = quay.io/fluentd_elasticsearch PREFIX = quay.io/fluentd_elasticsearch
IMAGE = fluentd IMAGE = fluentd
TAG = v2.6.0 TAG = v2.7.0
build: build:
docker build --tag ${PREFIX}/${IMAGE}:${TAG} . docker build --tag ${PREFIX}/${IMAGE}:${TAG} .
docker build --tag ${PREFIX}/${IMAGE}:latest .
push: push:
docker push ${PREFIX}/${IMAGE}:${TAG} docker push ${PREFIX}/${IMAGE}:${TAG}
docker push ${PREFIX}/${IMAGE}:latest docker push ${PREFIX}/${IMAGE}:latest