epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1208 from mattymo/1.6-flannel

Browse Source 
Update to k8s 1.6 with flannel and centos fixes
This commit is contained in:
Matthew Mosesohn
2017-04-06 13:04:02 +03:00
committed by GitHub
parent acae0fe4a3 ff2fb9196f
commit 75ea001bfe
9 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes/node/templates/kubelet.j2
View File

@@ -12,7 +12,9 @@ KUBELET_HOSTNAME="--hostname-override={{ ansible_hostname }}"
{% set kubelet_args_base %}--pod-manifest-path={{ kube_manifest_dir }} \
--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 }}{% endset %}
--node-status-update-frequency={{ kubelet_status_update_frequency }} \
--enable-cri={{ kubelet_enable_cri }} --cgroups-per-qos={{ kubelet_cgroups_per_qos }} \
--enforce-node-allocatable='{{ kubelet_enforce_node_allocatable }}'{% endset %}
{# DNS settings for kubelet #}
{% if dns_mode == 'kubedns' %}