mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-10-29 22:03:22 -02:30
Updates in the calico config and template to support disabling ipv4 pools during pure ipv6 deployment (#13225)
* #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:
@@ -56,12 +56,8 @@ data:
|
||||
{% else %}
|
||||
"ipam": {
|
||||
"type": "calico-ipam",
|
||||
{% if ipv4_stack %}
|
||||
"assign_ipv4": "true"{{ ',' if (ipv6_stack and ipv4_stack) }}
|
||||
{% endif %}
|
||||
{% if ipv6_stack %}
|
||||
"assign_ipv6": "true"
|
||||
{% endif %}
|
||||
"assign_ipv4": "{{ ipv4_stack | to_json }}",
|
||||
"assign_ipv6": "{{ ipv6_stack | to_json }}"
|
||||
},
|
||||
{% endif %}
|
||||
{% if calico_allow_ip_forwarding %}
|
||||
|
||||
@@ -259,6 +259,10 @@ spec:
|
||||
# no effect. This should fall within `--cluster-cidr`.
|
||||
# - name: CALICO_IPV4POOL_CIDR
|
||||
# value: "192.168.0.0/16"
|
||||
{% if not ipv4_stack %}
|
||||
- name: CALICO_IPV4POOL_CIDR
|
||||
value: "none"
|
||||
{% endif %}
|
||||
- name: CALICO_IPV4POOL_IPIP
|
||||
value: "{{ calico_ipv4pool_ipip }}"
|
||||
# Enable or Disable VXLAN on the default IP pool.
|
||||
|
||||
Reference in New Issue
Block a user