From 3b88d9c7c880d383d469375003524716d67e3021 Mon Sep 17 00:00:00 2001 From: RishabhSaini Date: Thu, 1 May 2025 09:05:19 -0400 Subject: [PATCH] render_controller: Wait for other sub-controllers regardless of Pool configuration kubelet_congfig_controller: Don't wait for Pool to be configured to sync --- .../kubelet-config/kubelet_config_controller.go | 8 -------- pkg/controller/render/render_controller.go | 7 ++----- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pkg/controller/kubelet-config/kubelet_config_controller.go b/pkg/controller/kubelet-config/kubelet_config_controller.go index 8dd2189ad2..0b5d97d6ee 100644 --- a/pkg/controller/kubelet-config/kubelet_config_controller.go +++ b/pkg/controller/kubelet-config/kubelet_config_controller.go @@ -601,14 +601,6 @@ func (ctrl *Controller) syncKubeletConfig(key string) error { } for _, pool := range mcpPools { - if pool.Spec.Configuration.Name == "" { - updateDelay := 5 * time.Second - // Previously we spammed the logs about empty pools. - // Let's just pause for a bit here to let the renderer - // initialize them. - time.Sleep(updateDelay) - return fmt.Errorf("Pool %s is unconfigured, pausing %v for renderer to initialize", pool.Name, updateDelay) - } role := pool.Name // Get MachineConfig managedKey, err := getManagedKubeletConfigKey(pool, ctrl.client, cfg) diff --git a/pkg/controller/render/render_controller.go b/pkg/controller/render/render_controller.go index 821a78c72f..82c829d450 100644 --- a/pkg/controller/render/render_controller.go +++ b/pkg/controller/render/render_controller.go @@ -443,11 +443,8 @@ func (ctrl *Controller) syncMachineConfigPool(key string) error { return err } - // If the Pool is unconfigured, let it generate the renderedMC before waiting. This prevents a deadlock between render controller and kubelet config controller. - if pool.Spec.Configuration.Name != "" { - if err := apihelpers.AreMCGeneratingSubControllersCompletedForPool(ctrl.crcLister.List, ctrl.mckLister.List, pool.Labels); err != nil { - return err - } + if err := apihelpers.AreMCGeneratingSubControllersCompletedForPool(ctrl.crcLister.List, ctrl.mckLister.List, pool.Labels); err != nil { + return err } mcs, err := ctrl.mcLister.List(selector)