epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 13:54:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Only limit etcd memory on small hosts (#1860)

Browse Source 
Also disable oom killer on etcd
This commit is contained in:
Matthew Mosesohn
2017-10-25 10:25:15 +01:00
committed by GitHub
parent 5b08277ce4
commit acb63a57fa
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/etcd/defaults/main.yml
View File

@@ -17,7 +17,8 @@ etcd_election_timeout: "5000"
etcd_metrics: "basic" etcd_metrics: "basic"
# Limits # Limits
etcd_memory_limit: 512M # Limit memory only if <4GB memory on host. 0=unlimited
etcd_memory_limit: "{% if ansible_memtotal_mb < 4096 %}512M{% else %}0{% endif %}"
# Uncomment to set CPU share for etcd # Uncomment to set CPU share for etcd
# etcd_cpu_limit: 300m # etcd_cpu_limit: 300m

1
roles/etcd/templates/etcd.j2
View File

@@ -9,6 +9,7 @@
{% if etcd_memory_limit is defined %} {% if etcd_memory_limit is defined %}
--memory={{ etcd_memory_limit|regex_replace('Mi', 'M') }} \ --memory={{ etcd_memory_limit|regex_replace('Mi', 'M') }} \
{% endif %} {% endif %}
--oom-kill-disable \
{% if etcd_cpu_limit is defined %} {% if etcd_cpu_limit is defined %}
--cpu-shares={{ etcd_cpu_limit|regex_replace('m', '') }} \ --cpu-shares={{ etcd_cpu_limit|regex_replace('m', '') }} \
{% endif %} {% endif %}