kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Calico: fix node ip subnet detection (#7065) 

We are currently setting the IP variable to hostIP,
Before https://github.com/projectcalico/node/pull/593 (not yet released)
Calico interpret that as hostIP/32
Using 'can-reach' we get the future behavior
This fixes vxlan and IPIP CrossSubnet modes

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
pull/7075/head
Etienne Champetier 2020-12-21 03:58:25 -05:00 committed by GitHub
parent 3470810709
commit 7d7739e031
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/network_plugin/calico/templates/calico-node.yml.j2
View File

@ -230,10 +230,14 @@ spec:
- name: IP - name: IP
value: "autodetect" value: "autodetect"
{% else %} {% else %}
- name: IP - name: NODEIP
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: status.hostIP fieldPath: status.hostIP
- name: IP_AUTODETECTION_METHOD
value: "can-reach=$(NODEIP)"
- name: IP
value: "autodetect"
{% endif %} {% endif %}
{% if calico_use_default_route_src_ipaddr|default(false) %} {% if calico_use_default_route_src_ipaddr|default(false) %}
- name: FELIX_DEVICEROUTESOURCEADDRESS - name: FELIX_DEVICEROUTESOURCEADDRESS