From 9c95195f8be4f8ea4922ec7248ee4a53c23a3ee3 Mon Sep 17 00:00:00 2001 From: Fabio Proietti Date: Wed, 17 Jun 2026 12:41:32 +0200 Subject: [PATCH 1/2] OCPBUGS-59958: move cleanUpDuplicatedMC to after pool loop in syncNodeConfigHandler --- pkg/controller/kubelet-config/kubelet_config_nodes.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/controller/kubelet-config/kubelet_config_nodes.go b/pkg/controller/kubelet-config/kubelet_config_nodes.go index 4e4ccc37d8..fd8eeea123 100644 --- a/pkg/controller/kubelet-config/kubelet_config_nodes.go +++ b/pkg/controller/kubelet-config/kubelet_config_nodes.go @@ -72,10 +72,6 @@ func (ctrl *Controller) syncNodeConfigHandler(key string) error { err := fmt.Errorf("could not fetch Node: %w", err) return err } - if err := ctrl.cleanUpDuplicatedMC(managedNodeConfigKeyPrefix); err != nil { - return err - } - // Fetch the controllerconfig cc, err := ctrl.ccLister.Get(ctrlcommon.ControllerConfigName) if err != nil { @@ -162,6 +158,9 @@ func (ctrl *Controller) syncNodeConfigHandler(key string) error { klog.Infof("Applied Node configuration %v on MachineConfigPool %v", key, pool.Name) ctrlcommon.UpdateStateMetric(ctrlcommon.MCCSubControllerState, "machine-config-controller-kubelet-config", "Sync NodeConfig", pool.Name) } + if err := ctrl.cleanUpDuplicatedMC(managedNodeConfigKeyPrefix); err != nil { + return err + } // fetch the kubeletconfigs kcs, err := ctrl.mckLister.List(labels.Everything()) if err != nil { From c63328419a25e10005403098d4e939a6ccc9affe Mon Sep 17 00:00:00 2001 From: Fabio Proietti Date: Mon, 22 Jun 2026 08:44:40 +0200 Subject: [PATCH 2/2] OCPBUGS-59958: Updated Unit Test, added extra getconfig check --- pkg/controller/kubelet-config/kubelet_config_nodes_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/controller/kubelet-config/kubelet_config_nodes_test.go b/pkg/controller/kubelet-config/kubelet_config_nodes_test.go index 666955fcd9..6f086785c1 100644 --- a/pkg/controller/kubelet-config/kubelet_config_nodes_test.go +++ b/pkg/controller/kubelet-config/kubelet_config_nodes_test.go @@ -73,6 +73,7 @@ func TestNodeConfigDefault(t *testing.T) { f.expectGetMachineConfigAction(mcsDeprecated) f.expectGetMachineConfigAction(mcs) f.expectCreateMachineConfigAction(mcs) + f.expectGetMachineConfigAction(mcs) f.runNode(getKeyFromConfigNode(nodeConfig, t)) }) }