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

Modified the default value of cilium IPAM and added the support for related parameters (#9443)

Browse Source 
Signed-off-by: dcwbq <biqiang.wu@daocloud.io>
This commit is contained in:
biqiang Wu
2023-03-14 08:45:10 +08:00
committed by GitHub
parent 99115ad04b
commit 2ae3ea9ee3
3 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
roles/network_plugin/cilium/defaults/main.yml
View File

@@ -152,9 +152,25 @@ cilium_hubble_install: false
### Enable auto generate certs if cilium_hubble_install: true
cilium_hubble_tls_generate: false
# IP address management mode for v1.9+.
# https://docs.cilium.io/en/v1.9/concepts/networking/ipam/
cilium_ipam_mode: kubernetes
# The default IP address management mode is "Cluster Scope".
# https://docs.cilium.io/en/stable/concepts/networking/ipam/
cilium_ipam_mode: cluster-pool
# Cluster Pod CIDRs use the kube_pods_subnet value by default.
# If your node network is in the same range you will lose connectivity to other nodes
cilium_pool_cidr: "{{ kube_pods_subnet | 10.233.64.0/18 }}"
# When cilium_enable_ipv6 is used, you need to set the IPV6 value
cilium_pool_cidr_ipv6: "{{ kube_pods_subnet_ipv6 | fd85:ee78:d8a6:8607::1:0000/112 }}"
# When cilium IPAM uses the "Cluster Scope" mode, it will pre-allocate a segment of IP to each node,
# schedule the Pod to this node, and then allocate IP from here. cilium_pool_mask_size Specifies
# the size allocated from cluster Pod CIDR to node.ipam.podCIDRs
cilium_pool_mask_size: "26"
# cilium_pool_mask_size Specifies the size allocated to node.ipam.podCIDRs from cluster Pod IPV6 CIDR
cilium_pool_mask_size_ipv6: "120"
# Extra arguments for the Cilium agent
cilium_agent_custom_args: []

8
roles/network_plugin/cilium/templates/cilium/config.yml.j2
View File

@@ -205,6 +205,14 @@ data:
# IPAM settings
ipam: "{{ cilium_ipam_mode }}"
{% if cilium_ipam_mode == "cluster-pool" %}
cluster-pool-ipv4-cidr: {% cilium_pool_cidr | default(kube_pods_subnet) %}
cluster-pool-ipv4-mask-size: {% cilium_pool_mask_size %}
{% if cilium_enable_ipv6 %}
cluster-pool-ipv6-cidr: {% cilium_pool_cidr_ipv6 | default(kube_pods_subnet_ipv6) %}
cluster-pool-ipv6-mask-size: {% cilium_pool_mask_size_ipv6 %}
{% endif %}
{% endif %}
agent-health-port: "{{ cilium_agent_health_port }}"