upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-04 22:33:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #47906 from gmarek/fluentd

Browse source 
Automatic merge from submit-queue

Decrese fluentd cpu request

Fix #47905

cc @piosz - this should fix your tests.
cc @dchen1107
This commit is contained in:
Kubernetes Submit Queue 2017-06-22 12:27:14 -07:00 committed by GitHub
commit 045a6dca07
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-elasticsearch/fluentd-es-ds.yaml
View file

@ -32,7 +32,7 @@ spec:
limits:
memory: 200Mi
requests:
cpu: 100m
cpu: 90m
memory: 200Mi
volumeMounts:
- name: varlog

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

@ -44,7 +44,7 @@ spec:
limits:
memory: 300Mi
requests:
cpu: 100m
cpu: 90m
memory: 200Mi
volumeMounts:
- name: varlog