mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-07 11:13:48 +00:00
fixed json logging in fluentd-elasticsearch image
This commit is contained in:
parent
de1656abbb
commit
61a709a7b2
@ -48,24 +48,24 @@ roleRef:
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
name: fluentd-es-v2.2.0
|
||||
name: fluentd-es-v2..0
|
||||
namespace: kube-system
|
||||
labels:
|
||||
k8s-app: fluentd-es
|
||||
version: v2.2.0
|
||||
version: v2.3.1
|
||||
kubernetes.io/cluster-service: "true"
|
||||
addonmanager.kubernetes.io/mode: Reconcile
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
k8s-app: fluentd-es
|
||||
version: v2.2.0
|
||||
version: v2.3.1
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
k8s-app: fluentd-es
|
||||
kubernetes.io/cluster-service: "true"
|
||||
version: v2.2.0
|
||||
version: v2.3.1
|
||||
# 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).
|
||||
@ -77,7 +77,7 @@ spec:
|
||||
serviceAccountName: fluentd-es
|
||||
containers:
|
||||
- name: fluentd-es
|
||||
image: k8s.gcr.io/fluentd-elasticsearch:v2.2.0
|
||||
image: k8s.gcr.io/fluentd-elasticsearch:v2.3.1
|
||||
env:
|
||||
- name: FLUENTD_ARGS
|
||||
value: --no-supervisor -q
|
||||
|
@ -2,7 +2,7 @@ source 'https://rubygems.org'
|
||||
|
||||
gem 'fluentd', '<=1.2.4'
|
||||
gem 'activesupport', '~>5.2.1'
|
||||
gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.1.2'
|
||||
gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.0.0'
|
||||
gem 'fluent-plugin-elasticsearch', '~>2.11.5'
|
||||
gem 'fluent-plugin-systemd', '~>1.0.1'
|
||||
gem 'fluent-plugin-detect-exceptions', '~>0.0.11'
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
PREFIX = staging-k8s.gcr.io
|
||||
IMAGE = fluentd-elasticsearch
|
||||
TAG = v2.3.0
|
||||
TAG = v2.3.1
|
||||
|
||||
build:
|
||||
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
|
||||
|
Loading…
Reference in New Issue
Block a user