github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #43441 from crassirostris/bump-fluentd-gcp-memory-limit

Browse Source 
Automatic merge from submit-queue

Increase memory limit for fluentd-gcp

This PR increases fluentd memory limit in fluentd-gcp addon to avoid OOMs. Request is left intact
This commit is contained in:
Kubernetes Submit Queue 2017-03-21 10:14:29 -07:00 committed by GitHub
commit 3d3062c17f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ spec:
value: --no-supervisor value: --no-supervisor
resources: resources:
limits: limits:
memory: 200Mi memory: 300Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 200Mi memory: 200Mi

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

@ -419,7 +419,7 @@ spec:
</match> </match>
resources: resources:
limits: limits:
memory: 200Mi memory: 300Mi
requests: requests:
# Any change here should be accompanied by a proportional change in CPU # Any change here should be accompanied by a proportional change in CPU
# requests of other per-node add-ons (e.g. kube-proxy). # requests of other per-node add-ons (e.g. kube-proxy).