C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add possibility to disable fail with swap (#1773)

Browse source
This commit is contained in:
Aivars Sterns 2017-10-11 21:49:31 +03:00 committed by Matthew Mosesohn
parent eeb7274d65
commit e41c0532e3
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roles/kubernetes/node/defaults/main.yml
View file

@ -25,6 +25,9 @@ kubelet_enforce_node_allocatable: "\"\""
# Note that PID namespace sharing requires docker >= 1.13.1. # Note that PID namespace sharing requires docker >= 1.13.1.
kubelet_disable_shared_pid: true kubelet_disable_shared_pid: true
### fail with swap on (default true)
kubelet_fail_swap_on: true
# Reserve this space for system resources # Reserve this space for system resources
kubelet_memory_limit: 256M kubelet_memory_limit: 256M
kubelet_cpu_limit: 100m kubelet_cpu_limit: 100m

1
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
View file

@ -28,6 +28,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
--node-status-update-frequency={{ kubelet_status_update_frequency }} \ --node-status-update-frequency={{ kubelet_status_update_frequency }} \
--cgroup-driver={{ kubelet_cgroup_driver|default(kubelet_cgroup_driver_detected) }} \ --cgroup-driver={{ kubelet_cgroup_driver|default(kubelet_cgroup_driver_detected) }} \
--docker-disable-shared-pid={{ kubelet_disable_shared_pid }} \ --docker-disable-shared-pid={{ kubelet_disable_shared_pid }} \
--fail-swap-on={{ kubelet_fail_swap_on|default(true)}} \
{% endset %} {% endset %}
{# Node reserved CPU/memory #} {# Node reserved CPU/memory #}

1
roles/kubernetes/node/templates/kubelet.standard.env.j2
View file

@ -21,6 +21,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{% endif %} {% endif %}
--cgroup-driver={{ kubelet_cgroup_driver|default(kubelet_cgroup_driver_detected) }} \ --cgroup-driver={{ kubelet_cgroup_driver|default(kubelet_cgroup_driver_detected) }} \
--cgroups-per-qos={{ kubelet_cgroups_per_qos }} \ --cgroups-per-qos={{ kubelet_cgroups_per_qos }} \
--fail-swap-on={{ kubelet_fail_swap_on|default(true)}} \
--enforce-node-allocatable={{ kubelet_enforce_node_allocatable }} {% endif %}{% endset %} --enforce-node-allocatable={{ kubelet_enforce_node_allocatable }} {% endif %}{% endset %}
{# DNS settings for kubelet #} {# DNS settings for kubelet #}