From b521255ec9df45c3778905a4c13e09310ac217e6 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Thu, 6 Apr 2017 21:07:48 +0300
Subject: [PATCH] Unbreak 1.5 deployment with kubelet
1.5 kubelet fails to start when using unknown params
---
roles/kubernetes/node/templates/kubelet.j2 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/roles/kubernetes/node/templates/kubelet.j2 b/roles/kubernetes/node/templates/kubelet.j2
index 522f3b05d..7d6a31efb 100644
--- a/roles/kubernetes/node/templates/kubelet.j2
+++ b/roles/kubernetes/node/templates/kubelet.j2
@@ -13,8 +13,9 @@ KUBELET_HOSTNAME="--hostname-override={{ ansible_hostname }}"
--pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_image_tag }} \
--kube-reserved cpu={{ kubelet_cpu_limit }},memory={{ kubelet_memory_limit|regex_replace('Mi', 'M') }} \
--node-status-update-frequency={{ kubelet_status_update_frequency }} \
+{% if kube_version | version_compare('v1.6', '>=') %}
--enable-cri={{ kubelet_enable_cri }} --cgroups-per-qos={{ kubelet_cgroups_per_qos }} \
- --enforce-node-allocatable='{{ kubelet_enforce_node_allocatable }}'{% endset %}
+--enforce-node-allocatable='{{ kubelet_enforce_node_allocatable }}' {% etndif %}{% endset %}
{# DNS settings for kubelet #}
{% if dns_mode == 'kubedns' %}
--
GitLab