Browse Source
Remove unused Calico CNI pool variables (#12369)
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
pull/12372/head
ERIK
3 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
0 additions and
9 deletions
-
inventory/sample/group_vars/k8s_cluster/k8s-net-calico.yml
-
roles/network_plugin/calico_defaults/defaults/main.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" |
|
|
|
|
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
|
