github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-16 07:13:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48066 from kubernetes/revert-47906-fluentd

Browse Source 
Automatic merge from submit-queue

Revert "Decrese fluentd cpu request"

Reverts kubernetes/kubernetes#47906
This commit is contained in:
Kubernetes Submit Queue 2017-06-26 09:52:24 -07:00 committed by GitHub
commit d8a939d117
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

@ -33,7 +33,7 @@ spec:
limits:
memory: 200Mi
requests:
cpu: 90m
cpu: 100m
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: 90m
cpu: 100m
memory: 200Mi
volumeMounts:
- name: varlog