add another option to disable allocating pod_cidrs

kubernetes-sigs · Jun 17, 2024 · a9c7125 · a9c7125
1 parent 3e72be2
commit a9c7125
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
@@ -374,3 +374,6 @@ kubeadm_patches:
 
 # Set to true to remove the role binding to anonymous users created by kubeadm
 remove_anonymous_access: false
+
+# disable allocating pod cidrs by the controller manager
+set_node_cidrs: false
diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
@@ -305,7 +305,7 @@ controllerManager:
     cluster-cidr: "{{ kube_pods_subnet }}{{ ',' + kube_pods_subnet_ipv6 if enable_dual_stack_networks else '' }}"
 {% endif %}
     service-cluster-ip-range: "{{ kube_service_addresses }}{{ ',' + kube_service_addresses_ipv6 if enable_dual_stack_networks else '' }}"
-{% if kube_network_plugin is defined and kube_network_plugin == "calico" and not calico_ipam_host_local %}
+{% if kube_network_plugin is defined and kube_network_plugin == "calico" and not calico_ipam_host_local or set_node_cidrs is defined and not set_node_cidrs "%}
     allocate-node-cidrs: "false"
 {% else %}
 {% if enable_dual_stack_networks %}