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 245cf73d0..cbe8c2a98 100644 --- a/inventory/sample/group_vars/k8s_cluster/k8s-net-calico.yml +++ b/inventory/sample/group_vars/k8s_cluster/k8s-net-calico.yml @@ -25,15 +25,9 @@ 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 -# add default ippool CIDR to CNI config -# calico_cni_pool: true - # Add default IPV6 IPPool CIDR. Must be inside kube_pods_subnet_ipv6. Defaults to kube_pods_subnet_ipv6 if not set. # calico_pool_cidr_ipv6: fd85:ee78:d8a6:8607::1:0000/112 -# Add default IPV6 IPPool CIDR to CNI config -# calico_cni_pool_ipv6: true - # Global as_num (/calico/bgp/v1/global/as_num) # global_as_num: "64512" diff --git a/roles/network_plugin/calico_defaults/defaults/main.yml b/roles/network_plugin/calico_defaults/defaults/main.yml index cf5550faa..899a9fd71 100644 --- a/roles/network_plugin/calico_defaults/defaults/main.yml +++ b/roles/network_plugin/calico_defaults/defaults/main.yml @@ -14,9 +14,6 @@ calico_ipv4pool_ipip: "Off" calico_ipip_mode: Never # valid values are 'Always', 'Never' and 'CrossSubnet' calico_vxlan_mode: Always # valid values are 'Always', 'Never' and 'CrossSubnet' -calico_cni_pool: true -calico_cni_pool_ipv6: true - # add default ippool blockSize calico_pool_blocksize: 26