From c9fe8fde59235fef312bc4ef2834964e9bb5702c Mon Sep 17 00:00:00 2001
From: Hassan Zamani <hsn.zamani@gmail.com>
Date: Wed, 18 Oct 2017 19:02:38 +0330
Subject: [PATCH] Use fail-swap-on flag only for kube_version >= 1.8 (#1829)
---
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 | 4 ++++
roles/kubernetes/node/templates/kubelet.standard.env.j2 | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
index 57a800471..cab2e3044 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 9a4854c40..1ccf8b409 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 #}
--
GitLab