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

Updates in the calico config and template to support disabling ipv4 pools during pure ipv6 deployment (#13225)

Browse Source 
* #13157: Updates in the calico config and template to support disabling ipv4 pools during pure ipv6 deployment

Signed-off-by: root <kanyahal.abhishek@gmail.com>

* Updates in the calico config and template to support disabling ipv4 pools during pure ipv6 deployment

* Updates in the calico config and template to support disabling ipv4 pools during pure ipv6 deployment

---------

Signed-off-by: root <kanyahal.abhishek@gmail.com>
This commit is contained in:
Abhishek Kanyahal
2026-09-03 13:10:27 +00:00
committed by GitHub
parent 1daa5c4af0
commit cf0e68ee98
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/network_plugin/calico/templates/calico-config.yml.j2
+2 -6
View File
@@ -56,12 +56,8 @@ data:
{% else %} {% else %}
"ipam": { "ipam": {
"type": "calico-ipam", "type": "calico-ipam",
{% if ipv4_stack %} "assign_ipv4": "{{ ipv4_stack | to_json }}",
"assign_ipv4": "true"{{ ',' if (ipv6_stack and ipv4_stack) }} "assign_ipv6": "{{ ipv6_stack | to_json }}"
{% endif %}
{% if ipv6_stack %}
"assign_ipv6": "true"
{% endif %}
}, },
{% endif %} {% endif %}
{% if calico_allow_ip_forwarding %} {% if calico_allow_ip_forwarding %}
roles/network_plugin/calico/templates/calico-node.yml.j2
+4
View File
@@ -259,6 +259,10 @@ spec:
# no effect. This should fall within `--cluster-cidr`. # no effect. This should fall within `--cluster-cidr`.
# - name: CALICO_IPV4POOL_CIDR # - name: CALICO_IPV4POOL_CIDR
# value: "192.168.0.0/16" # value: "192.168.0.0/16"
{% if not ipv4_stack %}
- name: CALICO_IPV4POOL_CIDR
value: "none"
{% endif %}
- name: CALICO_IPV4POOL_IPIP - name: CALICO_IPV4POOL_IPIP
value: "{{ calico_ipv4pool_ipip }}" value: "{{ calico_ipv4pool_ipip }}"
# Enable or Disable VXLAN on the default IP pool. # Enable or Disable VXLAN on the default IP pool.