C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Calico] Define FELIX_KUBENODEPORTRANGES when kube-proxy in ipvs mode (#4173)

Browse source 
* Define FELIX_KUBENODEPORTRANGES when kube-proxy in ipvs mode

* ensure kube_apiserver_node_port_range is defined
This commit is contained in:
Danny Kulchinsky 2019-02-04 15:42:40 -05:00 committed by Kubernetes Prow Robot
parent 52e0aa7a80
commit 226d5ed7de
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/network_plugin/calico/templates/calico-node.yml.j2
View file

@ -124,6 +124,10 @@ spec:
value: "{{ calico_endpoint_to_host_action|default('RETURN') }}" value: "{{ calico_endpoint_to_host_action|default('RETURN') }}"
- name: FELIX_HEALTHHOST - name: FELIX_HEALTHHOST
value: "{{ calico_healthhost }}" value: "{{ calico_healthhost }}"
{% if kube_proxy_mode == 'ipvs' and kube_apiserver_node_port_range is defined %}
- name: FELIX_KUBENODEPORTRANGES
value: "{{ kube_apiserver_node_port_range.split('-')[0] }}:{{ kube_apiserver_node_port_range.split('-')[1] }}"
{% endif %}
# Prior to v3.2.1 iptables didn't acquire the lock, so Calico's own implementation of the lock should be used, # Prior to v3.2.1 iptables didn't acquire the lock, so Calico's own implementation of the lock should be used,
# this is not required in later versions https://github.com/projectcalico/calico/issues/2179 # this is not required in later versions https://github.com/projectcalico/calico/issues/2179
{% if calico_version is version('v3.2.1', '<') %} {% if calico_version is version('v3.2.1', '<') %}