epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix reserved memory unit in kubelet configuration (#6725)

Browse Source 
* Fix reserved memory unit in kubelet configuration

Signed-off-by: Wang Zhen <lazybetrayer@gmail.com>

* Move systemReserved default values from template

Signed-off-by: Wang Zhen <lazybetrayer@gmail.com>
This commit is contained in:
Wang Zhen
2020-09-23 06:20:09 +08:00
committed by GitHub
parent 80df4f8b01
commit edea63511d
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
roles/kubernetes/node/templates/kubelet-config.v1beta1.yaml.j2
View File

@@ -60,19 +60,19 @@ clusterDNS:
kubeReserved:
{% if is_kube_master|bool %}
cpu: {{ kube_master_cpu_reserved }}
memory: {{ kube_master_memory_reserved|regex_replace('Mi', 'M') }}
memory: {{ kube_master_memory_reserved }}
{% else %}
cpu: {{ kube_cpu_reserved }}
memory: {{ kube_memory_reserved|regex_replace('Mi', 'M') }}
memory: {{ kube_memory_reserved }}
{% endif %}
{% if system_reserved is defined and system_reserved %}
systemReserved:
{% if is_kube_master|bool %}
cpu: {{ system_master_cpu_reserved|default('250m') }}
memory: {{ system_master_memory_reserved|default('256M')|regex_replace('Mi', 'M') }}
cpu: {{ system_master_cpu_reserved }}
memory: {{ system_master_memory_reserved }}
{% else %}
cpu: {{ system_cpu_reserved|default('500m') }}
memory: {{ system_memory_reserved|default('512M')|regex_replace('Mi', 'M') }}
cpu: {{ system_cpu_reserved }}
memory: {{ system_memory_reserved }}
{% endif %}
{% endif %}
resolvConf: "{{ kube_resolv_conf }}"