External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-27 07:56:14 -03:30
Code Issues Packages Projects Releases Wiki Activity

Revert "Add support for ipv6 only cluster via "enable_ipv6only_stack_networks…"

Browse Source 
This reverts commit 76c0a3aa75.
This commit is contained in:
Antoine Legrand
2025-02-03 13:53:39 +01:00
committed by GitHub
parent 59e1638ae1
commit 2720c8137a
37 changed files with 104 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/network_plugin/calico/templates/calico-config.yml.j2
View File

@@ -56,14 +56,10 @@ data:
{% else %}
"ipam": {
"type": "calico-ipam",
{% if enable_ipv6only_stack_networks %}
"assign_ipv6": "true"
{% elif enable_dual_stack_networks %}
{% if enable_dual_stack_networks %}
"assign_ipv6": "true",
{% endif %}
{% if not enable_ipv6only_stack_networks %}
{% endif %}
"assign_ipv4": "true"
{% endif %}
},
{% endif %}
{% if calico_allow_ip_forwarding %}

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

@@ -259,15 +259,13 @@ spec:
# no effect. This should fall within `--cluster-cidr`.
# - name: CALICO_IPV4POOL_CIDR
# value: "192.168.0.0/16"
{% if not enable_ipv6only_stack_networks %}
- name: CALICO_IPV4POOL_IPIP
value: "{{ calico_ipv4pool_ipip }}"
{% endif %}
# Enable or Disable VXLAN on the default IP pool.
- name: CALICO_IPV4POOL_VXLAN
value: "Never"
- name: FELIX_IPV6SUPPORT
value: "{{ (enable_dual_stack_networks or enable_ipv6only_stack_networks) | default(false) }}"
value: "{{ enable_dual_stack_networks | default(false) }}"
# Set Felix logging to "info"
- name: FELIX_LOGSEVERITYSCREEN
value: "{{ calico_loglevel }}"
@@ -310,28 +308,20 @@ spec:
- name: IP_AUTODETECTION_METHOD
value: "can-reach=$(NODEIP)"
{% endif %}
{% if calico_ip6_auto_method is defined and (enable_dual_stack_networks or enable_ipv6only_stack_networks) %}
- name: IP
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_ipv6only_stack_networks %}
- name: IP6
value: "autodetect"
- name: IP
value: none
{% elif enable_dual_stack_networks %}
- name: IP6
value: "autodetect"
- name: IP
value: "autodetect"
{% else %}
- name: IP
value: "autodetect"
{% endif %}
{% if calico_felix_mtu_iface_pattern is defined %}
- name: FELIX_MTUIFACEPATTERN
value: "{{ calico_felix_mtu_iface_pattern }}"
{% endif %}
{% if enable_dual_stack_networks %}
- name: IP6
value: autodetect
{% endif %}
{% if calico_use_default_route_src_ipaddr | default(false) %}
- name: FELIX_DEVICEROUTESOURCEADDRESS
valueFrom: