External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-04 02:58:17 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix flannel for 1.6 and apply fixes to enable containerized kubelet

Browse Source
This commit is contained in:
Matthew Mosesohn
2017-04-05 13:47:03 +03:00
parent ccc11e5680
commit ff2fb9196f
8 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/docker/templates/docker-options.conf.j2
View File

@@ -1,2 +1,3 @@
[Service]
Environment="DOCKER_OPTS={% if docker_options is defined %}{{ docker_options }}{% endif %} --iptables={% if kube_network_plugin == 'flannel' %}true{% else %}false{% endif %}"
Environment="DOCKER_OPTS={{ docker_options | default('') }} \
--iptables={% if kube_network_plugin == 'flannel' %}true{% else %}false{% endif %}"