From 2d65554cb9212ab9d0f3af3cd774635c567d9ce8 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn <mmosesohn@mirantis.com> Date: Wed, 15 Feb 2017 16:15:22 +0300 Subject: [PATCH] Change default network plugin to Calico --- README.md | 2 +- docs/vars.md | 2 +- inventory/group_vars/all.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3f2fa1549..eb896255d 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ in order to avoid any issue during deployment you should disable your firewall. ## Network plugins -You can choose between 4 network plugins. (default: `flannel` with vxlan backend) +You can choose between 4 network plugins. (default: `calico`) * [**flannel**](docs/flannel.md): gre/vxlan (layer 2) networking. diff --git a/docs/vars.md b/docs/vars.md index 2f19d1348..2e59f859c 100644 --- a/docs/vars.md +++ b/docs/vars.md @@ -23,7 +23,7 @@ Some variables of note include: * *hyperkube_image_repo* - Specify the Docker repository where Hyperkube resides * *hyperkube_image_tag* - Specify the Docker tag where Hyperkube resides -* *kube_network_plugin* - Changes k8s plugin to Calico +* *kube_network_plugin* - Sets k8s network plugin (default Calico) * *kube_proxy_mode* - Changes k8s proxy mode to iptables mode * *kube_version* - Specify a given Kubernetes hyperkube version * *searchdomains* - Array of DNS domains to search when looking up hostnames diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 63ce419fb..2e882af92 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -105,9 +105,9 @@ etcd_multiaccess: true # kube_apiserver_port (default 443) loadbalancer_apiserver_localhost: true -# Choose network plugin (calico, weave or flannel) +# Choose network plugin (calico, canal, weave or flannel) # Can also be set to 'cloud', which lets the cloud provider setup appropriate routing -kube_network_plugin: flannel +kube_network_plugin: calico # Kubernetes internal network for services, unused block of space. kube_service_addresses: 10.233.0.0/18 -- GitLab