crc & kcc: Before deleting a degraded MC, ensure that the annotations

have not been updated since the last check

Author: RishabhSaini

pkg/controller/container-runtime-config/container_runtime_config_controller.go

@@ -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)
 			}

pkg/controller/kubelet-config/kubelet_config_controller.go

@@ -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)
 			}