Merge pull request #1210 from mattymo/fix-1.5-kubelet
Unbreak 1.5 deployment with kubelet
This commit is contained in:
commit
797bdbd998
1 changed files with 2 additions and 1 deletions
|
@ -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 }}' {% endif %}{% endset %}
|
||||
|
||||
{# DNS settings for kubelet #}
|
||||
{% if dns_mode == 'kubedns' %}
|
||||
|
|
Loading…
Reference in a new issue