External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-09 05:29:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

add support for Calico IP6_AUTODETECTION_METHOD (#8541)

Browse Source
This commit is contained in:
kakkotetsu
2022-02-15 10:26:14 +09:00
committed by GitHub
parent c6e5314fab
commit 1ebe456f2d
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inventory/sample/group_vars/k8s_cluster/k8s-net-calico.yml
View File

@@ -92,11 +92,13 @@
# Cenable eBPF mode # Cenable eBPF mode
# calico_bpf_enabled: false # calico_bpf_enabled: false
# If you want to use non default IP_AUTODETECTION_METHOD for calico node set this option to one of: # If you want to use non default IP_AUTODETECTION_METHOD, IP6_AUTODETECTION_METHOD for calico node set this option to one of:
# * can-reach=DESTINATION # * can-reach=DESTINATION
# * interface=INTERFACE-REGEX # * interface=INTERFACE-REGEX
# see https://docs.projectcalico.org/reference/node/configuration # see https://docs.projectcalico.org/reference/node/configuration
# calico_ip_auto_method: "interface=eth.*" # calico_ip_auto_method: "interface=eth.*"
# calico_ip6_auto_method: "interface=eth.*"
# Choose the iptables insert mode for Calico: "Insert" or "Append". # Choose the iptables insert mode for Calico: "Insert" or "Append".
# calico_felix_chaininsertmode: Insert # calico_felix_chaininsertmode: Insert

5
roles/network_plugin/calico/defaults/main.yml
View File

@@ -85,11 +85,12 @@ calico_wireguard_enabled: false
calico_wireguard_packages: [] calico_wireguard_packages: []
calico_wireguard_repo: https://download.copr.fedorainfracloud.org/results/jdoss/wireguard/epel-{{ ansible_distribution_major_version }}-$basearch/ calico_wireguard_repo: https://download.copr.fedorainfracloud.org/results/jdoss/wireguard/epel-{{ ansible_distribution_major_version }}-$basearch/
# If you want to use non default IP_AUTODETECTION_METHOD for calico node set this option to one of: # If you want to use non default IP_AUTODETECTION_METHOD, IP6_AUTODETECTION_METHOD for calico node set this option to one of:
# * can-reach=DESTINATION # * can-reach=DESTINATION
# * interface=INTERFACE-REGEX # * interface=INTERFACE-REGEX
# see https://docs.projectcalico.org/v3.0/reference/node/configuration#ip-autodetection-methods # see https://projectcalico.docs.tigera.io/reference/node/configuration#ip-autodetection-methods
# calico_ip_auto_method: "interface=eth.*" # calico_ip_auto_method: "interface=eth.*"
# calico_ip6_auto_method: "interface=eth.*"
calico_baremetal_nodename: "{{ kube_override_hostname | default(inventory_hostname) }}" calico_baremetal_nodename: "{{ kube_override_hostname | default(inventory_hostname) }}"

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

@@ -267,6 +267,10 @@ spec:
{% endif %} {% endif %}
- name: IP - name: IP
value: "autodetect" value: "autodetect"
{% if calico_ip6_auto_method is defined and enable_dual_stack_networks %}
- name: IP6_AUTODETECTION_METHOD
value: "{{ calico_ip6_auto_method }}"
{% endif %}
{% if enable_dual_stack_networks %} {% if enable_dual_stack_networks %}
- name: IP6 - name: IP6
value: autodetect value: autodetect