C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Possible remove ippools from cni config (#8845)

Browse source 
* Possible remove ippools from cni config

* Typo

* Update roles/network_plugin/calico/templates/cni-calico.conflist.j2

Co-authored-by: Kenichi Omichi <ken1ohmichi@gmail.com>

* Update cni-calico.conflist.j2

Incorrectly deleted calico forwarding content.

* Update roles/network_plugin/calico/templates/cni-calico.conflist.j2

Co-authored-by: Kenichi Omichi <ken1ohmichi@gmail.com>

Co-authored-by: Kenichi Omichi <ken1ohmichi@gmail.com>
This commit is contained in:
Tamas Pasztor 2022-05-20 08:45:13 +02:00 committed by GitHub
parent 0e6b727e53
commit 9d3a894991
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
inventory/sample/group_vars/k8s_cluster/k8s-net-calico.yml
View file

@ -24,9 +24,15 @@ calico_cni_name: k8s-pod-network
# add default ippool CIDR (must be inside kube_pods_subnet, defaults to kube_pods_subnet otherwise) # add default ippool CIDR (must be inside kube_pods_subnet, defaults to kube_pods_subnet otherwise)
# calico_pool_cidr: 1.2.3.4/5 # 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. # 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 # 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 (/calico/bgp/v1/global/as_num)
# global_as_num: "64512" # global_as_num: "64512"

3
roles/network_plugin/calico/defaults/main.yml
View file

@ -13,6 +13,9 @@ calico_ipv4pool_ipip: "Off"
calico_ipip_mode: Never # valid values are 'Always', 'Never' and 'CrossSubnet' calico_ipip_mode: Never # valid values are 'Always', 'Never' and 'CrossSubnet'
calico_vxlan_mode: Always # 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
# Calico doesn't support ipip tunneling for the IPv6. # Calico doesn't support ipip tunneling for the IPv6.
calico_ipip_mode_ipv6: Never calico_ipip_mode_ipv6: Never
calico_vxlan_mode_ipv6: Never calico_vxlan_mode_ipv6: Never

8
roles/network_plugin/calico/templates/cni-calico.conflist.j2
View file

@ -32,10 +32,14 @@
"type": "calico-ipam", "type": "calico-ipam",
{% if enable_dual_stack_networks %} {% if enable_dual_stack_networks %}
"assign_ipv6": "true", "assign_ipv6": "true",
{% if calico_cni_pool_ipv6 %}
"ipv6_pools": ["{{ calico_pool_cidr_ipv6 | default(kube_pods_subnet_ipv6) }}"], "ipv6_pools": ["{{ calico_pool_cidr_ipv6 | default(kube_pods_subnet_ipv6) }}"],
{% endif %} {% endif %}
"assign_ipv4": "true", {% endif %}
"ipv4_pools": ["{{ calico_pool_cidr | default(kube_pods_subnet) }}"] {% if calico_cni_pool %}
"ipv4_pools": ["{{ calico_pool_cidr | default(kube_pods_subnet) }}"],
{% endif %}
"assign_ipv4": "true"
}, },
{% endif %} {% endif %}
{% if calico_allow_ip_forwarding %} {% if calico_allow_ip_forwarding %}