github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #75967 from ialidzhikov/fluentd-1.4.1

Browse Source 
Update fluentd 1.4.1
This commit is contained in:
Kubernetes Prow Robot 2019-04-05 11:51:58 -07:00 committed by GitHub
commit 63ae37304b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 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

@ -48,24 +48,24 @@ roleRef:
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-es-v2.5.0 name: fluentd-es-v2.5.1
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v2.5.0 version: v2.5.1
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
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.5.0 version: v2.5.1
template: template:
metadata: metadata:
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v2.5.0 version: v2.5.1
# 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).
@ -77,7 +77,7 @@ spec:
serviceAccountName: fluentd-es serviceAccountName: fluentd-es
containers: containers:
- name: fluentd-es - name: fluentd-es
image: k8s.gcr.io/fluentd-elasticsearch:v2.5.0 image: gcr.io/fluentd-elasticsearch/fluentd:v2.5.1
env: env:
- name: FLUENTD_ARGS - name: FLUENTD_ARGS
value: --no-supervisor -q value: --no-supervisor -q

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

@ -1,7 +1,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'activesupport', '~>5.2.2' gem 'activesupport', '~>5.2.2'
gem 'fluentd', '<=1.4.0' gem 'fluentd', '<=1.4.1'
gem 'fluent-plugin-concat', '~>2.3.0' gem 'fluent-plugin-concat', '~>2.3.0'
gem 'fluent-plugin-detect-exceptions', '~>0.0.12' gem 'fluent-plugin-detect-exceptions', '~>0.0.12'
gem 'fluent-plugin-elasticsearch', '~>3.3.3' gem 'fluent-plugin-elasticsearch', '~>3.3.3'

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

@ -16,7 +16,7 @@
PREFIX = gcr.io/fluentd-elasticsearch PREFIX = gcr.io/fluentd-elasticsearch
IMAGE = fluentd IMAGE = fluentd
TAG = v2.5.0 TAG = v2.5.1
build: build:
gcloud builds submit --tag $(PREFIX)/$(IMAGE):$(TAG) gcloud builds submit --tag $(PREFIX)/$(IMAGE):$(TAG)

4
cluster/addons/fluentd-elasticsearch/fluentd-es-image/README.md
View File

@ -4,11 +4,11 @@ that collects Docker container log files using [Fluentd][fluentd]
and sends them to an instance of [Elasticsearch][elasticsearch]. and sends them to an instance of [Elasticsearch][elasticsearch].
This image is designed to be used as part of the [Kubernetes][kubernetes] This image is designed to be used as part of the [Kubernetes][kubernetes]
cluster bring up process. The image resides at GCR under the name cluster bring up process. The image resides at GCR under the name
[k8s.gcr.io/fluentd-elasticsearch][image]. [gcr.io/fluentd-elasticsearch/fluentd][image].
[fluentd]: http://www.fluentd.org/ [fluentd]: http://www.fluentd.org/
[elasticsearch]: https://www.elastic.co/products/elasticsearch [elasticsearch]: https://www.elastic.co/products/elasticsearch
[kubernetes]: https://kubernetes.io [kubernetes]: https://kubernetes.io
[image]: https://k8s.gcr.io/fluentd-elasticsearch [image]: https://gcr.io/fluentd-elasticsearch/fluentd
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/fluentd-elasticsearch/fluentd-es-image/README.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/fluentd-elasticsearch/fluentd-es-image/README.md?pixel)]()