|
|
@ -61,8 +61,7 @@ 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" |
|
|
|
KUBELET_NETWORK_PLUGIN="--hairpin-mode=promiscuous-bridge --network-plugin=kubenet" |
|
|
|
{% endif %} |
|
|
|
# Should this cluster be allowed to run privileged docker containers |
|
|
|
KUBE_ALLOW_PRIV="--allow-privileged=true" |
|
|
|