mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
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:
commit
61f321fc12
@ -31,11 +31,8 @@
|
|||||||
"-c",
|
"-c",
|
||||||
"./cluster-autoscaler --kubernetes=http://127.0.0.1:8080?inClusterConfig=f --v=4 {{params}} 1>>/var/log/cluster-autoscaler.log 2>&1"
|
"./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": {
|
"resources": {
|
||||||
"limits": {
|
|
||||||
"cpu": "100m",
|
|
||||||
"memory": "300Mi"
|
|
||||||
},
|
|
||||||
"requests": {
|
"requests": {
|
||||||
"cpu": "20m",
|
"cpu": "20m",
|
||||||
"memory": "300Mi"
|
"memory": "300Mi"
|
||||||
|
@ -33,11 +33,9 @@ spec:
|
|||||||
name: logfile
|
name: logfile
|
||||||
readOnly: false
|
readOnly: false
|
||||||
resources:
|
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.
|
# master components on a single core master.
|
||||||
limits:
|
# TODO: Make resource requirements depend on the size of the cluster
|
||||||
cpu: 100m
|
|
||||||
memory: 100Mi
|
|
||||||
requests:
|
requests:
|
||||||
cpu: 10m
|
cpu: 10m
|
||||||
memory: 50Mi
|
memory: 50Mi
|
||||||
|
@ -17,10 +17,8 @@ spec:
|
|||||||
- mountPath: /var/log/rescheduler.log
|
- mountPath: /var/log/rescheduler.log
|
||||||
name: logfile
|
name: logfile
|
||||||
readOnly: false
|
readOnly: false
|
||||||
|
# TODO: Make resource requirements depend on the size of the cluster
|
||||||
resources:
|
resources:
|
||||||
limits:
|
|
||||||
cpu: 100m
|
|
||||||
memory: 300Mi
|
|
||||||
requests:
|
requests:
|
||||||
cpu: 10m
|
cpu: 10m
|
||||||
memory: 100Mi
|
memory: 100Mi
|
||||||
|
Loading…
Reference in New Issue
Block a user