Merge pull request #1031 from mattymo/defaultcalico

Change default network plugin to Calico
This commit is contained in:
Smaine Kahlouch 2017-02-16 14:04:12 +01:00 committed by GitHub
commit 73e0aeb4ca
3 changed files with 4 additions and 4 deletions

View file

@ -76,7 +76,7 @@ in order to avoid any issue during deployment you should disable your firewall.
## Network plugins ## 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. * [**flannel**](docs/flannel.md): gre/vxlan (layer 2) networking.

View file

@ -23,7 +23,7 @@ Some variables of note include:
* *hyperkube_image_repo* - Specify the Docker repository where Hyperkube * *hyperkube_image_repo* - Specify the Docker repository where Hyperkube
resides resides
* *hyperkube_image_tag* - Specify the Docker tag 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_proxy_mode* - Changes k8s proxy mode to iptables mode
* *kube_version* - Specify a given Kubernetes hyperkube version * *kube_version* - Specify a given Kubernetes hyperkube version
* *searchdomains* - Array of DNS domains to search when looking up hostnames * *searchdomains* - Array of DNS domains to search when looking up hostnames

View file

@ -105,9 +105,9 @@ etcd_multiaccess: true
# kube_apiserver_port (default 443) # kube_apiserver_port (default 443)
loadbalancer_apiserver_localhost: true 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 # 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. # Kubernetes internal network for services, unused block of space.
kube_service_addresses: 10.233.0.0/18 kube_service_addresses: 10.233.0.0/18