From 309aaee4278fa427b23c6d581c7904667f885b94 Mon Sep 17 00:00:00 2001
From: Kay Yan <yankay@users.noreply.github.com>
Date: Mon, 20 Mar 2023 17:41:17 +0800
Subject: [PATCH] fix-cilium-error (#9902)

---
 docs/cilium.md                                   | 16 +++++++++-------
 roles/network_plugin/cilium/defaults/main.yml    | 15 +++++++++------
 .../cilium/templates/cilium/config.yml.j2        |  8 ++++----
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/docs/cilium.md b/docs/cilium.md
index e03c1a087..0482b0b18 100644
--- a/docs/cilium.md
+++ b/docs/cilium.md
@@ -4,7 +4,7 @@
 
 IP Address Management (IPAM) is responsible for the allocation and management of IP addresses used by network endpoints (container and others) managed by Cilium. The default mode is "Cluster Scope".
 
-You can set the following parameters:
+You can set the following parameters, for example: cluster-pool, kubernetes:
 
 ```yml
 cilium_ipam_mode: cluster-pool
@@ -13,15 +13,16 @@ cilium_ipam_mode: cluster-pool
 ### Set the cluster Pod CIDRs
 
 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
-
+If your node network is in the same range you will lose connectivity to other nodes.
+Defaults to kube_pods_subnet if not set.
 You can set the following parameters:
 
 ```yml
 cilium_pool_cidr: 10.233.64.0/18
 ```
 
-When cilium_enable_ipv6 is used, you need to set the IPV6 value:
+When cilium_enable_ipv6 is used. Defaults to kube_pods_subnet_ipv6 if not set.
+you need to set the IPV6 value:
 
 ```yml
 cilium_pool_cidr_ipv6: fd85:ee78:d8a6:8607::1:0000/112
@@ -31,13 +32,14 @@ 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
+the size allocated from cluster Pod CIDR to node.ipam.podCIDRs.
+Defaults to kube_network_node_prefix if not set.
 
 ```yml
-cilium_pool_mask_size: "26"
+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 Specifies the size allocated to node.ipam.podCIDRs from cluster Pod IPV6 CIDR. Defaults to kube_network_node_prefix_ipv6 if not set.
 
 ```yml
 cilium_pool_mask_size_ipv6: "120"
diff --git a/roles/network_plugin/cilium/defaults/main.yml b/roles/network_plugin/cilium/defaults/main.yml
index a9a38d9cb..bcc8e753a 100644
--- a/roles/network_plugin/cilium/defaults/main.yml
+++ b/roles/network_plugin/cilium/defaults/main.yml
@@ -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
diff --git a/roles/network_plugin/cilium/templates/cilium/config.yml.j2 b/roles/network_plugin/cilium/templates/cilium/config.yml.j2
index 6b727bc6f..700dd0841 100644
--- a/roles/network_plugin/cilium/templates/cilium/config.yml.j2
+++ b/roles/network_plugin/cilium/templates/cilium/config.yml.j2
@@ -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 %}