Skip to content

OCPBUGS-56558: Recheck generatedByControllerVersion annotation prior to deleting a degraded MC #5259

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

Merged
merged 1 commit into from
Sep 3, 2025
+32 −2
Merged

OCPBUGS-56558: Recheck generatedByControllerVersion annotation prior to deleting a degraded MC #5259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 1 deletion pkg/controller/container-runtime-config/container_runtime_config_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,8 +779,13 @@ func (ctrl *Controller) cleanUpDuplicatedMC() error {
if !strings.Contains(mc.Name, generatedCtrCfg) {
continue
}
// Recheck to ensure nothing changed in between
mcToBeDeleted, err := ctrl.client.MachineconfigurationV1().MachineConfigs().Get(context.TODO(), mc.Name, metav1.GetOptions{})
if err != nil {
return err
}
// delete the containerruntime mc if its degraded
if mc.Annotations[ctrlcommon.GeneratedByControllerVersionAnnotationKey] != version.Hash {
if mcToBeDeleted.Annotations[ctrlcommon.GeneratedByControllerVersionAnnotationKey] != version.Hash {
if err := ctrl.client.MachineconfigurationV1().MachineConfigs().Delete(context.TODO(), mc.Name, metav1.DeleteOptions{}); err != nil && !errors.IsNotFound(err) {
return fmt.Errorf("error deleting degraded containerruntime machine config %s: %w", mc.Name, err)
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/controller/container-runtime-config/container_runtime_config_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,7 @@ func TestContainerRuntimeConfigCreate(t *testing.T) {
f.expectUpdateContainerRuntimeConfigRoot(ctrcfg1)
f.expectCreateMachineConfigAction(mcs1)
f.expectPatchContainerRuntimeConfig(ctrcfg1, ctrcfgPatchBytes)
f.expectGetMachineConfigAction(mcs2)
f.expectUpdateContainerRuntimeConfig(ctrcfg1)

f.run(getKey(ctrcfg1, t))
Expand Down Expand Up @@ -698,6 +699,7 @@ func TestContainerRuntimeConfigUpdate(t *testing.T) {
f.expectUpdateContainerRuntimeConfigRoot(ctrcfg1)
f.expectCreateMachineConfigAction(mcs)
f.expectPatchContainerRuntimeConfig(ctrcfg1, ctrcfgPatchBytes)
f.expectGetMachineConfigAction(mcs)
f.expectUpdateContainerRuntimeConfig(ctrcfg1)

c := f.newController()
Expand Down Expand Up @@ -740,6 +742,7 @@ func TestContainerRuntimeConfigUpdate(t *testing.T) {
f.expectUpdateContainerRuntimeConfig(ctrcfgUpdate)
f.expectUpdateMachineConfigAction(mcsUpdate)
f.expectPatchContainerRuntimeConfig(ctrcfgUpdate, ctrcfgPatchBytes)
f.expectGetMachineConfigAction(mcsUpdate)
f.expectUpdateContainerRuntimeConfig(ctrcfgUpdate)

f.validateActions()
Expand Down Expand Up @@ -1651,6 +1654,7 @@ func TestCtrruntimeConfigMultiCreate(t *testing.T) {
f.expectUpdateContainerRuntimeConfigRoot(ccr)
f.expectCreateMachineConfigAction(mcs)
f.expectPatchContainerRuntimeConfig(ccr, []byte(expectedPatch))
f.expectGetMachineConfigAction(mcs)
f.expectUpdateContainerRuntimeConfig(ccr)
f.run(poolName)
}
Expand Down Expand Up @@ -1760,6 +1764,7 @@ func TestAddAnnotationExistingContainerRuntimeConfig(t *testing.T) {
f.expectUpdateContainerRuntimeConfigRoot(ctrc)
f.expectUpdateMachineConfigAction(ctrcfgMC)
f.expectPatchContainerRuntimeConfig(ctrc, []byte("{}"))
f.expectGetMachineConfigAction(ctrcfgMC)
f.expectUpdateContainerRuntimeConfig(ctrc)

c := f.newController()
Expand Down
7 changes: 6 additions & 1 deletion pkg/controller/kubelet-config/kubelet_config_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,8 +751,13 @@ func (ctrl *Controller) cleanUpDuplicatedMC(prefix string) error {
if !strings.HasPrefix(mc.Name, prefix) {
continue
}
// Recheck to ensure nothing changed in between
mcToBeDeleted, err := ctrl.client.MachineconfigurationV1().MachineConfigs().Get(context.TODO(), mc.Name, metav1.GetOptions{})
if err != nil {
return err
}
// delete the mc if its degraded
if mc.Annotations[ctrlcommon.GeneratedByControllerVersionAnnotationKey] != version.Hash {
if mcToBeDeleted.Annotations[ctrlcommon.GeneratedByControllerVersionAnnotationKey] != version.Hash {
if err := ctrl.client.MachineconfigurationV1().MachineConfigs().Delete(context.TODO(), mc.Name, metav1.DeleteOptions{}); err != nil && !macherrors.IsNotFound(err) {
return fmt.Errorf("error deleting degraded kubelet machine config %s: %w", mc.Name, err)
}
Expand Down
11 changes: 11 additions & 0 deletions pkg/controller/kubelet-config/kubelet_config_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,7 @@ func TestKubeletConfigCreate(t *testing.T) {
f.expectUpdateKubeletConfigRoot(kc1)
f.expectCreateMachineConfigAction(mcs)
f.expectPatchKubeletConfig(kc1, kcfgPatchBytes)
f.expectGetMachineConfigAction(mcs)
f.expectUpdateKubeletConfig(kc1)

f.run(getKey(kc1, t))
Expand Down Expand Up @@ -510,6 +511,7 @@ func TestKubeletConfigMultiCreate(t *testing.T) {
f.expectUpdateKubeletConfigRoot(kc)
f.expectCreateMachineConfigAction(mcs)
f.expectPatchKubeletConfig(kc, []byte(expectedPatch))
f.expectGetMachineConfigAction(mcs)
f.expectUpdateKubeletConfig(kc)
f.run(poolName)
}
Expand Down Expand Up @@ -558,6 +560,7 @@ func TestKubeletConfigAutoSizingReserved(t *testing.T) {
f.expectUpdateKubeletConfigRoot(kc1)
f.expectCreateMachineConfigAction(mcs)
f.expectPatchKubeletConfig(kc1, kcfgPatchBytes)
f.expectGetMachineConfigAction(mcs)
f.expectUpdateKubeletConfig(kc1)

f.run(getKey(kc1, t))
Expand Down Expand Up @@ -601,6 +604,7 @@ func TestKubeletConfiglogFile(t *testing.T) {
f.expectUpdateKubeletConfigRoot(kc1)
f.expectCreateMachineConfigAction(mcs)
f.expectPatchKubeletConfig(kc1, kcfgPatchBytes)
f.expectGetMachineConfigAction(mcs)
f.expectUpdateKubeletConfig(kc1)

f.run(getKey(kc1, t))
Expand Down Expand Up @@ -638,6 +642,7 @@ func TestKubeletConfigUpdates(t *testing.T) {
f.expectUpdateKubeletConfigRoot(kc1)
f.expectCreateMachineConfigAction(mcs)
f.expectPatchKubeletConfig(kc1, kcfgPatchBytes)
f.expectGetMachineConfigAction(mcs)
f.expectUpdateKubeletConfig(kc1)

c := f.newController(fgHandler)
Expand Down Expand Up @@ -696,6 +701,7 @@ func TestKubeletConfigUpdates(t *testing.T) {
f.expectGetMachineConfigAction(mcs)
f.expectUpdateMachineConfigAction(mcUpdate)
f.expectPatchKubeletConfig(kcUpdate, kcfgPatchBytes)
f.expectGetMachineConfigAction(mcs)
f.expectUpdateKubeletConfig(kcUpdate)

f.validateActions()
Expand Down Expand Up @@ -742,6 +748,7 @@ func TestMachineConfigUpdateUponFeatureGateUpdate(t *testing.T) {
f.expectUpdateKubeletConfigRoot(kc1)
f.expectCreateMachineConfigAction(mcs)
f.expectPatchKubeletConfig(kc1, kcfgPatchBytes)
f.expectGetMachineConfigAction(mcs)
f.expectUpdateKubeletConfig(kc1)

c := f.newController(fgHandler)
Expand Down Expand Up @@ -787,6 +794,7 @@ func TestMachineConfigUpdateUponFeatureGateUpdate(t *testing.T) {
f.expectGetMachineConfigAction(mcs)
f.expectUpdateMachineConfigAction(mcUpdate)
f.expectPatchKubeletConfig(kc1, kcfgPatchBytes)
f.expectGetMachineConfigAction(mcs)
f.expectUpdateKubeletConfig(kc1)

f.validateActions()
Expand Down Expand Up @@ -834,6 +842,7 @@ func TestMachineConfigSkipUpdate(t *testing.T) {
f.expectUpdateKubeletConfigRoot(kc1)
f.expectCreateMachineConfigAction(mcs)
f.expectPatchKubeletConfig(kc1, kcfgPatchBytes)
f.expectGetMachineConfigAction(mcs)
f.expectUpdateKubeletConfig(kc1)

c := f.newController(fgHandler)
Expand Down Expand Up @@ -981,6 +990,7 @@ func TestKubeletFeatureExists(t *testing.T) {
f.expectUpdateKubeletConfigRoot(kc1)
f.expectCreateMachineConfigAction(mcs)
f.expectPatchKubeletConfig(kc1, kcfgPatchBytes)
f.expectGetMachineConfigAction(mcs)
f.expectUpdateKubeletConfig(kc1)

f.run(getKey(kc1, t))
Expand Down Expand Up @@ -1200,6 +1210,7 @@ func TestAddAnnotationExistingKubeletConfig(t *testing.T) {
f.expectUpdateKubeletConfigRoot(kc)
f.expectUpdateMachineConfigAction(kcMC)
f.expectPatchKubeletConfig(kc, []byte("{}"))
f.expectGetMachineConfigAction(kcMC)
f.expectUpdateKubeletConfig(kc)

c := f.newController(fgHandler)
Expand Down
4 changes: 4 additions & 0 deletions pkg/controller/kubelet-config/kubelet_config_features_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ func TestFeaturesDefault(t *testing.T) {
f.expectGetMachineConfigAction(mcs2Deprecated)
f.expectGetMachineConfigAction(mcs2)
f.expectCreateMachineConfigAction(mcs2)
f.expectGetMachineConfigAction(mcs2Deprecated)
f.expectGetMachineConfigAction(mcs2)

f.runFeature(getKeyFromFeatureGate(features, t), fgHandler)
})
Expand Down Expand Up @@ -153,6 +155,8 @@ func TestFeaturesCustomNoUpgrade(t *testing.T) {
f.expectGetMachineConfigAction(mcs2Deprecated)
f.expectGetMachineConfigAction(mcs2)
f.expectCreateMachineConfigAction(mcs2)
f.expectGetMachineConfigAction(mcs2Deprecated)
f.expectGetMachineConfigAction(mcs2)
f.runFeature(getKeyFromFeatureGate(features, t), fgHandler)
})
}
Expand Down