diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-net-calico.yml b/inventory/sample/group_vars/k8s_cluster/k8s-net-calico.yml index cb8cde067e2193671a03eadcbdc35c5c4c5b1229..553e48b9877be8b8f1a1184a4e78553abdb37099 100644 --- a/inventory/sample/group_vars/k8s_cluster/k8s-net-calico.yml +++ b/inventory/sample/group_vars/k8s_cluster/k8s-net-calico.yml @@ -19,7 +19,7 @@ calico_cni_name: k8s-pod-network # calico_pool_name: "default-pool" # add default ippool blockSize (defaults kube_network_node_prefix) -# calico_pool_blocksize: 24 +calico_pool_blocksize: 26 # add default ippool CIDR (must be inside kube_pods_subnet, defaults to kube_pods_subnet otherwise) # calico_pool_cidr: 1.2.3.4/5 diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml index e7711424449ac67b5f4a2b91509cc486e043aa3d..2f1c42e0b7049f2f3d167a82e55c2074ab2b9762 100644 --- a/roles/network_plugin/calico/defaults/main.yml +++ b/roles/network_plugin/calico/defaults/main.yml @@ -16,10 +16,15 @@ calico_vxlan_mode: Always # valid values are 'Always', 'Never' and 'CrossSubnet calico_cni_pool: true calico_cni_pool_ipv6: true +# add default ippool blockSize (defaults kube_network_node_prefix) +calico_pool_blocksize: 26 + # Calico doesn't support ipip tunneling for the IPv6. calico_ipip_mode_ipv6: Never calico_vxlan_mode_ipv6: Never -calico_pool_blocksize_ipv6: 116 + +# add default ipv6 ippool blockSize (defaults kube_network_node_prefix_ipv6) +calico_pool_blocksize_ipv6: 122 # Calico network backend can be 'bird', 'vxlan' and 'none' calico_network_backend: vxlan diff --git a/tests/files/packet_debian11-calico-upgrade-once.yml b/tests/files/packet_debian11-calico-upgrade-once.yml index 9dd264ad9faf9ae3d408684d1ec58811f203b271..3c589a0bdd972f1c1ad09615273cf8666e8d3080 100644 --- a/tests/files/packet_debian11-calico-upgrade-once.yml +++ b/tests/files/packet_debian11-calico-upgrade-once.yml @@ -8,6 +8,7 @@ download_run_once: true # Pin disabling ipip mode to ensure proper upgrade ipip: false +calico_pool_blocksize: 26 calico_vxlan_mode: Always calico_network_backend: bird diff --git a/tests/files/packet_debian11-calico-upgrade.yml b/tests/files/packet_debian11-calico-upgrade.yml index 3df0f6d8d1bb5405dff26d0c76e56ff9e23633a1..1b05714e41121cb0b3099e229079e97251102e42 100644 --- a/tests/files/packet_debian11-calico-upgrade.yml +++ b/tests/files/packet_debian11-calico-upgrade.yml @@ -5,6 +5,7 @@ mode: default # Pin disabling ipip mode to ensure proper upgrade ipip: false +calico_pool_blocksize: 26 calico_vxlan_mode: Always calico_network_backend: bird diff --git a/tests/testcases/040_check-network-adv.yml b/tests/testcases/040_check-network-adv.yml index 2c765bd72e3e86451e0cc3139c13560e74552708..8d1e5122ebfd72b73582fa0b31760ba95fa6d3a0 100644 --- a/tests/testcases/040_check-network-adv.yml +++ b/tests/testcases/040_check-network-adv.yml @@ -2,7 +2,7 @@ - hosts: kube_node tasks: - name: Test tunl0 routes - shell: "set -o pipefail && ! /sbin/ip ro | grep '/{{ calico_pool_blocksize}} | default(26) via' | grep -v tunl0" + shell: "set -o pipefail && ! /sbin/ip ro | grep '/{{ calico_pool_blocksize }} | default(26) via' | grep -v tunl0" args: executable: /bin/bash when: