From 8c3f6270f841a951c962aecd088c2eb8d2e102d3 Mon Sep 17 00:00:00 2001 From: Justin Lamp <32171364+modzilla99@users.noreply.github.com> Date: Sat, 16 May 2026 08:04:34 +0200 Subject: [PATCH] Add toggle to disable node subnet allocation (#13239) Signed-off-by: Justin Lamp --- .../control-plane/defaults/main/main.yml | 3 +++ .../templates/kubeadm-config.v1beta4.yaml.j2 | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/roles/kubernetes/control-plane/defaults/main/main.yml b/roles/kubernetes/control-plane/defaults/main/main.yml index d3582fb00..82c3bcd82 100644 --- a/roles/kubernetes/control-plane/defaults/main/main.yml +++ b/roles/kubernetes/control-plane/defaults/main/main.yml @@ -41,6 +41,9 @@ control_plane_health_retries: 60 # Default retries for apiserver, scheduler, co kube_controller_manager_leader_elect_lease_duration: 15s kube_controller_manager_leader_elect_renew_deadline: 10s +# Controls whether or not the kube_controller_manager allocates subnets for the node object +kube_controller_manager_allocate_node_cidrs: true + # discovery_timeout modifies the discovery timeout discovery_timeout: 5m0s diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 index a86fe42ae..abedae3b1 100644 --- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 +++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 @@ -365,14 +365,15 @@ controllerManager: {% endif %} - name: service-cluster-ip-range value: "{{ kube_service_subnets }}" -{% if ( - kube_network_plugin is defined and - kube_network_plugin == "calico" and - not calico_ipam_host_local - ) or ( - kube_network_plugin is defined and - kube_network_plugin == "cilium" and - cilium_ipam_mode == "cluster-pool" +{% if not kube_controller_manager_allocate_node_cidrs + or kube_network_plugin is defined and ( + ( + kube_network_plugin == "calico" and + not calico_ipam_host_local + ) or ( + kube_network_plugin == "cilium" and + cilium_ipam_mode == "cluster-pool" + ) ) %} - name: allocate-node-cidrs