diff --git a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 index 57a8004719793a9c3f20f2b2253b51fe4ca52676..cab2e304460462907a25baffc411ebacc2f7fe9b 100644 --- a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 +++ b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 @@ -28,7 +28,11 @@ 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 }} \ +{% if kube_version | version_compare('v1.8', '<') %} +--experimental-fail-swap-on={{ kubelet_fail_swap_on|default(true)}} \ +{% else %} --fail-swap-on={{ kubelet_fail_swap_on|default(true)}} \ +{% endif %} {% 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 9a4854c4071893b8c418aca8ecde0984daedb030..1ccf8b409d80a474e3afb112b19bc7da3eaa5633 100644 --- a/roles/kubernetes/node/templates/kubelet.standard.env.j2 +++ b/roles/kubernetes/node/templates/kubelet.standard.env.j2 @@ -24,7 +24,11 @@ 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 }} \ +{% if kube_version | version_compare('v1.8', '<') %} +--experimental-fail-swap-on={{ kubelet_fail_swap_on|default(true)}} \ +{% else %} --fail-swap-on={{ kubelet_fail_swap_on|default(true)}} \ +{% endif %} --enforce-node-allocatable={{ kubelet_enforce_node_allocatable }} {% endif %}{% endset %} {# DNS settings for kubelet #}