Skip to content

K
k3s
Commit 3d47fcc8 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #38286 from Crassirostris/fluentd-es-logging-loop

Automatic merge from submit-queue Avoid exporting fluentd-es own logs Follow-up of https://github.com/kubernetes/kubernetes/pull/38213 for fluentd-es version CC @piosz
parents aae1b145 a971941e
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
View file @ 3d47fcc8
...@@ -9,6 +9,10 @@ spec: ...@@ -9,6 +9,10 @@ spec:
containers: containers:
- name: fluentd-elasticsearch - name: fluentd-elasticsearch
image: gcr.io/google_containers/fluentd-elasticsearch:1.20 image: gcr.io/google_containers/fluentd-elasticsearch:1.20
command:
- '/bin/sh'
- '-c'
- '/usr/sbin/td-agent 2>&1 >>/var/log/fluentd.log'
resources: resources:
limits: limits:
memory: 200Mi memory: 200Mi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment