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

Compare Calico pool CIDRs as networks (#13579)

Browse Source 
The check compares the Calico IP pool CIDR with the inventory as
strings, so the same network in a different notation fails, for
example fd85:ee78:d8a6:202::1:0000/112 and fd85:ee78:d8a6:202::1:0/112.
Use ipaddr('net') on the two sides.

Signed-off-by: Ali Afsharzadeh <afsharzadeh8@gmail.com>
Co-authored-by: Ali Afsharzadeh <afsharzadeh8@gmail.com>
This commit is contained in:
k8s-infra-cherrypick-robot
2026-09-26 09:34:37 +00:00
committed by GitHub
co-authored by Ali Afsharzadeh
parent 25be587fdd
commit fcf9f9d6f0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/network_plugin/calico/tasks/check.yml
+2 -2
View File
@@ -164,7 +164,7 @@
assert:
that:
- calico_pool_conf.spec.blockSize | int == calico_pool_blocksize | int
- calico_pool_conf.spec.cidr == (calico_pool_cidr | default(kube_pods_subnet))
- calico_pool_conf.spec.cidr | ansible.utils.ipaddr('net') == (calico_pool_cidr | default(kube_pods_subnet)) | ansible.utils.ipaddr('net')
- not calico_pool_conf.spec.ipipMode is defined or calico_pool_conf.spec.ipipMode == calico_ipip_mode
- not calico_pool_conf.spec.vxlanMode is defined or calico_pool_conf.spec.vxlanMode == calico_vxlan_mode
msg: "Your inventory doesn't match the current cluster configuration"
@@ -198,7 +198,7 @@
assert:
that:
- calico_pool_ipv6_conf.spec.blockSize | int == calico_pool_blocksize_ipv6 | int
- calico_pool_ipv6_conf.spec.cidr == (calico_pool_cidr_ipv6 | default(kube_pods_subnet_ipv6))
- calico_pool_ipv6_conf.spec.cidr | ansible.utils.ipaddr('net') == (calico_pool_cidr_ipv6 | default(kube_pods_subnet_ipv6)) | ansible.utils.ipaddr('net')
- not calico_pool_ipv6_conf.spec.ipipMode is defined or calico_pool_ipv6_conf.spec.ipipMode == calico_ipip_mode_ipv6
- not calico_pool_ipv6_conf.spec.vxlanMode is defined or calico_pool_ipv6_conf.spec.vxlanMode == calico_vxlan_mode_ipv6
msg: "Your ipv6 inventory doesn't match the current cluster configuration"