External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-10-31 14:36:20 -02:30
Code Issues Packages Projects Releases Wiki Activity

Calico: update files to handle multi-asn bgp peering conditions. (#6971)

Browse Source 
* update files to handle multi-asn bgp peering conditions.

* put back in the serviceClusterIPs.  Bad merge.

* remove extraneous environment var.

* update files as discussed with mirwan

* update titles.

* add not in.

* add a conditional for using bgp to advertise cluster ips.

Co-authored-by: marlow-h <mweston@habana.ai>
This commit is contained in:
Catblade
2020-12-17 22:54:25 -08:00
committed by GitHub
co-authored by marlow-h
parent db17ba54b4
commit 10a6bd67de
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/network_plugin/calico/templates/calico-node.yml.j2
-4
View File
@@ -224,10 +224,6 @@ spec:
value: "{{ calico_felix_prometheusgometricsenabled }}"
- name: FELIX_PROMETHEUSPROCESSMETRICSENABLED
value: "{{ calico_felix_prometheusprocessmetricsenabled }}"
{% if calico_advertise_cluster_ips|default(false) %}
- name: CALICO_ADVERTISE_CLUSTER_IPS
value: "{{ kube_service_addresses }}"
{% endif %}
{% if calico_ip_auto_method is defined %}
- name: IP_AUTODETECTION_METHOD
value: "{{ calico_ip_auto_method }}"