Merge pull request #32363 from gmarek/limits

Automatic merge from submit-queue

Remove explicit limits from manifest files

Current setting make those addons OOM in 2k Node clusters.

cc @piosz @mwielgus @bprashanth
This commit is contained in:
Kubernetes Submit Queue 2016-09-09 04:06:48 -07:00 committed by GitHub
commit 61f321fc12
3 changed files with 4 additions and 11 deletions

View File

@ -31,11 +31,8 @@
"-c",
"./cluster-autoscaler --kubernetes=http://127.0.0.1:8080?inClusterConfig=f --v=4 {{params}} 1>>/var/log/cluster-autoscaler.log 2>&1"
],
# TODO: Make resource requirements depend on the size of the cluster
"resources": {
"limits": {
"cpu": "100m",
"memory": "300Mi"
},
"requests": {
"cpu": "20m",
"memory": "300Mi"

View File

@ -33,11 +33,9 @@ spec:
name: logfile
readOnly: false
resources:
# Request and limits are set to accomodate this pod alongside the other
# Request is set to accomodate this pod alongside the other
# master components on a single core master.
limits:
cpu: 100m
memory: 100Mi
# TODO: Make resource requirements depend on the size of the cluster
requests:
cpu: 10m
memory: 50Mi

View File

@ -17,10 +17,8 @@ spec:
- mountPath: /var/log/rescheduler.log
name: logfile
readOnly: false
# TODO: Make resource requirements depend on the size of the cluster
resources:
limits:
cpu: 100m
memory: 300Mi
requests:
cpu: 10m
memory: 100Mi