epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-10 12:18:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update Calico to 2.4.1 release.

Browse Source 
- Switched Calico images to be pulled from quay.io
- Updated Canal too
This commit is contained in:
Erik Stidham
2017-08-07 10:33:37 -05:00
parent e91c04f586
commit 9f9f70aade
5 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/network_plugin/calico/templates/calico.env.j2
View File

@@ -4,6 +4,11 @@ ETCD_CERT_FILE="{{ calico_cert_dir }}/cert.crt"
ETCD_KEY_FILE="{{ calico_cert_dir }}/key.pem"
CALICO_IP="{{ip | default(ansible_default_ipv4.address) }}"
CALICO_IP6=""
{% if calico_network_backend is defined and calico_network_backend == 'none' %}
CLUSTER_TYPE="kubespray"
{% else %}
CLUSTER_TYPE="kubespray,bgp"
{% endif %}
{% if calico_network_backend is defined %}
CALICO_NETWORKING_BACKEND="{{calico_network_backend }}"
{% endif %}