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

Initial version of Flannel using CNI (#1486)

Browse Source 
* Updates Controller Manager/Kubelet with Flannel's required configuration for CNI
* Removes old Flannel installation
* Install CNI enabled Flannel DaemonSet/ConfigMap/CNI bins and config (with portmap plugin) on host
* Uses RBAC if enabled
* Fixed an issue that could occur if br_netfilter is not a module and net.bridge.bridge-nf-call-iptables sysctl was not set
This commit is contained in:
Chad Swenson
2017-08-25 02:07:50 -05:00
committed by Matthew Mosesohn
parent 4550dccb84
commit a39e78d42d
16 changed files with 279 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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