From 46d3f4369e14f2443dae03e40609c986e0a7fd70 Mon Sep 17 00:00:00 2001 From: Amit Kumar Jaiswal Date: Mon, 3 Jul 2017 04:06:42 +0530 Subject: [PATCH 1/4] Updated K8s version Signed-off-by: Amit Kumar Jaiswal --- roles/kubernetes/node/templates/kubelet.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kubernetes/node/templates/kubelet.j2 b/roles/kubernetes/node/templates/kubelet.j2 index d2959b8a6..829d1f0be 100644 --- a/roles/kubernetes/node/templates/kubelet.j2 +++ b/roles/kubernetes/node/templates/kubelet.j2 @@ -13,7 +13,7 @@ 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', '>=') %} +{% if kube_version | version_compare('v1.7', '>=') %} --enable-cri={{ kubelet_enable_cri }} --cgroups-per-qos={{ kubelet_cgroups_per_qos }} \ --enforce-node-allocatable='{{ kubelet_enforce_node_allocatable }}' {% endif %}{% endset %} From c36fb5919a2f3018c468dde91925aa389f36e609 Mon Sep 17 00:00:00 2001 From: Amit Kumar Jaiswal Date: Mon, 3 Jul 2017 15:55:04 +0530 Subject: [PATCH 2/4] Update kubelet.j2 Updated!! --- roles/kubernetes/node/templates/kubelet.j2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/kubernetes/node/templates/kubelet.j2 b/roles/kubernetes/node/templates/kubelet.j2 index 829d1f0be..9bead7a39 100644 --- a/roles/kubernetes/node/templates/kubelet.j2 +++ b/roles/kubernetes/node/templates/kubelet.j2 @@ -13,7 +13,10 @@ 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.7', '>=') %} +{% if kube_version | version_compare('v1.6', '>=') %} +{# flag got removed with 1.7.0 #} +{% if kube_version | version_compare('v1.7', '<') %} +--enable-cri={{ kubelet_enable_cri }} {% endif %} --enable-cri={{ kubelet_enable_cri }} --cgroups-per-qos={{ kubelet_cgroups_per_qos }} \ --enforce-node-allocatable='{{ kubelet_enforce_node_allocatable }}' {% endif %}{% endset %} From 3d2680a1025091c2be0fbff2f01d69f0dbeccd82 Mon Sep 17 00:00:00 2001 From: Amit Kumar Jaiswal Date: Mon, 3 Jul 2017 15:58:50 +0530 Subject: [PATCH 3/4] Update kubelet.j2 Updated! --- roles/kubernetes/node/templates/kubelet.j2 | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/kubernetes/node/templates/kubelet.j2 b/roles/kubernetes/node/templates/kubelet.j2 index 9bead7a39..a8174c769 100644 --- a/roles/kubernetes/node/templates/kubelet.j2 +++ b/roles/kubernetes/node/templates/kubelet.j2 @@ -16,7 +16,6 @@ KUBELET_HOSTNAME="--hostname-override={{ ansible_hostname }}" {% if kube_version | version_compare('v1.6', '>=') %} {# flag got removed with 1.7.0 #} {% if kube_version | version_compare('v1.7', '<') %} ---enable-cri={{ kubelet_enable_cri }} {% endif %} --enable-cri={{ kubelet_enable_cri }} --cgroups-per-qos={{ kubelet_cgroups_per_qos }} \ --enforce-node-allocatable='{{ kubelet_enforce_node_allocatable }}' {% endif %}{% endset %} From 319a0d65af2e0fac4e64257f30a7e63fd4da4760 Mon Sep 17 00:00:00 2001 From: Amit Kumar Jaiswal Date: Mon, 3 Jul 2017 16:23:35 +0530 Subject: [PATCH 4/4] Update kubelet.j2 Updated with closing endif. --- roles/kubernetes/node/templates/kubelet.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/kubernetes/node/templates/kubelet.j2 b/roles/kubernetes/node/templates/kubelet.j2 index a8174c769..8c0ea94b5 100644 --- a/roles/kubernetes/node/templates/kubelet.j2 +++ b/roles/kubernetes/node/templates/kubelet.j2 @@ -16,7 +16,9 @@ KUBELET_HOSTNAME="--hostname-override={{ ansible_hostname }}" {% if kube_version | version_compare('v1.6', '>=') %} {# flag got removed with 1.7.0 #} {% if kube_version | version_compare('v1.7', '<') %} ---enable-cri={{ kubelet_enable_cri }} --cgroups-per-qos={{ kubelet_cgroups_per_qos }} \ +--enable-cri={{ kubelet_enable_cri }} \ +{% endif %} +--cgroups-per-qos={{ kubelet_cgroups_per_qos }} \ --enforce-node-allocatable='{{ kubelet_enforce_node_allocatable }}' {% endif %}{% endset %} {# DNS settings for kubelet #}