Skip to content

[release-4.20] OCPBUGS-93807: move cleanUpDuplicatedMC to avoid double reboot on first updated Master node #6242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
openshift-cherrypick-robot wants to merge 2 commits into
base: release-4.20
Choose a base branch
from
+4 −4
Open

[release-4.20] OCPBUGS-93807: move cleanUpDuplicatedMC to avoid double reboot on first updated Master node #6242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c95195
OCPBUGS-59958: move cleanUpDuplicatedMC to after pool loop in syncNod…
proietfb Jun 17, 2026
c633284
OCPBUGS-59958: Updated Unit Test, added extra getconfig check
proietfb Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pkg/controller/kubelet-config/kubelet_config_nodes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/kubelet-config/kubelet_config_nodes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
})
}
Expand Down