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

Merge pull request #708 from vwfs/cloud_network

Browse Source 
Add support for cloud-provider based networking
This commit is contained in:
Smaine Kahlouch
2016-12-14 16:23:20 +01:00
committed by GitHub
parent e6fe9d5807 d50eb60827
commit 29874baf8a
6 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,9 @@ KUBELET_ARGS="{{ kubelet_args }}"
KUBELET_NETWORK_PLUGIN="--network-plugin=cni --network-plugin-dir=/etc/cni/net.d"
{% elif kube_network_plugin is defined and kube_network_plugin == "weave" %}
DOCKER_SOCKET="--docker-endpoint=unix:/var/run/weave/weave.sock"
{% elif kube_network_plugin is defined and kube_network_plugin == "cloud" %}
# Please note that --reconcile-cidr is deprecated and a no-op in Kubernetes 1.5 but still required in 1.4
KUBELET_NETWORK_PLUGIN="--hairpin-mode=promiscuous-bridge --network-plugin=kubenet --reconcile-cidr=true"
{% endif %}
# Should this cluster be allowed to run privileged docker containers
KUBE_ALLOW_PRIV="--allow-privileged=true"