scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #74616 from ialidzhikov/fluentd-1.4.0

Browse Source 
Update fluentd to 1.4.0
This commit is contained in:
Kubernetes Prow Robot
2019-03-26 12:33:48 -07:00
committed by GitHub
parent 29566d0a65 db6add318a
commit 753a6edc37
3 changed files with 11 additions and 11 deletions
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.4.0 name: fluentd-es-v2.5.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
version: v2.4.0 version: v2.5.0
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.4.0 version: v2.5.0
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.4.0 version: v2.5.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).
@@ -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.4.0 image: k8s.gcr.io/fluentd-elasticsearch:v2.5.0
env: env:
- name: FLUENTD_ARGS - name: FLUENTD_ARGS
value: --no-supervisor -q value: --no-supervisor -q

10
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.2' gem 'activesupport', '~>5.2.2'
gem 'fluentd', '<=1.3.3' gem 'fluentd', '<=1.4.0'
gem 'fluent-plugin-concat', '~>2.3.0' gem 'fluent-plugin-concat', '~>2.3.0'
gem 'fluent-plugin-detect-exceptions', '~>0.0.11' gem 'fluent-plugin-detect-exceptions', '~>0.0.12'
gem 'fluent-plugin-elasticsearch', '~>3.0.1' gem 'fluent-plugin-elasticsearch', '~>3.3.3'
gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.6' gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.6'
gem 'fluent-plugin-multi-format-parser', '~>1.0.0' gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
gem 'fluent-plugin-prometheus', '~>1.3.0' gem 'fluent-plugin-prometheus', '~>1.3.0'
gem 'fluent-plugin-systemd', '~>1.0.1' gem 'fluent-plugin-systemd', '~>1.0.2'
gem 'oj', '~>3.7.6' gem 'oj', '~>3.7.9'

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.4.0 TAG = v2.5.0
build: build:
gcloud builds submit --tag $(PREFIX)/$(IMAGE):$(TAG) gcloud builds submit --tag $(PREFIX)/$(IMAGE):$(TAG)