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

fix-cilium-error (#9902)

Browse Source
This commit is contained in:
Kay Yan
2023-03-20 17:41:17 +08:00
committed by GitHub
parent 349c8901f8
commit 309aaee427
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,19 +157,22 @@ cilium_hubble_tls_generate: false
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 }}"
# If your node network is in the same range you will lose connectivity to other nodes.
# Defaults to kube_pods_subnet if not set.
# cilium_pool_cidr: 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_enable_ipv6 is used, you need to set the IPV6 value. Defaults to kube_pods_subnet_ipv6 if not set.
# cilium_pool_cidr_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"
# Defaults to kube_network_node_prefix if not set.
# cilium_pool_mask_size: "24"
# cilium_pool_mask_size Specifies the size allocated to node.ipam.podCIDRs from cluster Pod IPV6 CIDR
cilium_pool_mask_size_ipv6: "120"
# Defaults to kube_network_node_prefix_ipv6 if not set.
# cilium_pool_mask_size_ipv6: "120"
# Extra arguments for the Cilium agent

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

@@ -206,11 +206,11 @@ 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 %}
cluster-pool-ipv4-cidr: "{{ cilium_pool_cidr | default(kube_pods_subnet) }}"
cluster-pool-ipv4-mask-size: "{{ cilium_pool_mask_size | default(kube_network_node_prefix) }}"
{% 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 %}
cluster-pool-ipv6-cidr: "{{ cilium_pool_cidr_ipv6 | default(kube_pods_subnet_ipv6) }}"
cluster-pool-ipv6-mask-size: "{{ cilium_pool_mask_size_ipv6 | default(kube_network_node_prefix_ipv6) }}"
{% endif %}
{% endif %}