github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41795 from Crassirostris/fluentd-gcp-turn-supervisor-off

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41797, 41793, 41795, 41807, 41781)

Turn fluentd supervisor off for fluentd-gcp

By default, turn fluentd supervisor off so that when fluentd process fails, for example due to OOM, container fails completely and it would be easy to detect.

CC @igorpeshansky @qingling128
This commit is contained in:
Kubernetes Submit Queue 2017-02-22 22:06:33 -08:00 committed by GitHub
commit e64835683b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View File

@ -35,6 +35,9 @@ spec:
- '/bin/sh' - '/bin/sh'
- '-c' - '-c'
- '/run.sh $FLUENTD_ARGS 2>&1 >>/var/log/fluentd.log' - '/run.sh $FLUENTD_ARGS 2>&1 >>/var/log/fluentd.log'
env:
- name: FLUENTD_ARGS
value: --no-supervisor
resources: resources:
limits: limits:
memory: 200Mi memory: 200Mi

3
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View File

@ -25,6 +25,9 @@ spec:
- '/bin/sh' - '/bin/sh'
- '-c' - '-c'
- '/run.sh $FLUENTD_ARGS 2>&1 >>/var/log/fluentd.log' - '/run.sh $FLUENTD_ARGS 2>&1 >>/var/log/fluentd.log'
env:
- name: FLUENTD_ARGS
value: --no-supervisor
resources: resources:
limits: limits:
memory: 200Mi memory: 200Mi