diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml index 4b6ed6b14182c19cde9c830c7ec47bab7c6c9763..05a34cec1f42889b03adb09983d83ea49c7a1f18 100644 --- a/roles/kubernetes/node/defaults/main.yml +++ b/roles/kubernetes/node/defaults/main.yml @@ -25,6 +25,9 @@ kubelet_enforce_node_allocatable: "\"\"" # Note that PID namespace sharing requires docker >= 1.13.1. kubelet_disable_shared_pid: true +### fail with swap on (default true) +kubelet_fail_swap_on: true + # Reserve this space for system resources kubelet_memory_limit: 256M kubelet_cpu_limit: 100m diff --git a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 index 817c8a34a6d3a0deda805a7e58d67729b7937499..57a8004719793a9c3f20f2b2253b51fe4ca52676 100644 --- a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 +++ b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 @@ -28,6 +28,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" --node-status-update-frequency={{ kubelet_status_update_frequency }} \ --cgroup-driver={{ kubelet_cgroup_driver|default(kubelet_cgroup_driver_detected) }} \ --docker-disable-shared-pid={{ kubelet_disable_shared_pid }} \ +--fail-swap-on={{ kubelet_fail_swap_on|default(true)}} \ {% endset %} {# Node reserved CPU/memory #} diff --git a/roles/kubernetes/node/templates/kubelet.standard.env.j2 b/roles/kubernetes/node/templates/kubelet.standard.env.j2 index 574a541ba1a4e1447b9ab43d0bfa090019ca51ad..677b886c2ad44f591a20e6a9be159b3b0e2226b7 100644 --- a/roles/kubernetes/node/templates/kubelet.standard.env.j2 +++ b/roles/kubernetes/node/templates/kubelet.standard.env.j2 @@ -21,6 +21,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" {% endif %} --cgroup-driver={{ kubelet_cgroup_driver|default(kubelet_cgroup_driver_detected) }} \ --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 %} {# DNS settings for kubelet #}