fix: avoid removing finalizers on configmap in snapshot processing when configmap is already deleted

Make qosClass immmutable in podSyncer

Author: flomedja

pkg/controllers/resources/pods/syncer.go

@@ -377,9 +377,18 @@ func (s *podSyncer) Sync(ctx *synccontext.SyncContext, event *synccontext.SyncEv
 	// NewSyncerPatcher() is called so that there are no
 	// differences found in host QOSClass and virtual QOSClass and
 	// a patch event for this field is not created
-	event.Host.Status.QOSClass = event.VirtualOld.Status.QOSClass
+	virtualQOS := event.Virtual.Status.QOSClass
+	if event.VirtualOld != nil {
+		virtualQOS = event.VirtualOld.Status.QOSClass
+	}
+	// Set both Host and Virtual to the same QOSClass value to prevent patching
+	event.Host.Status.QOSClass = virtualQOS
 	if event.HostOld != nil {
-		event.Virtual.Status.QOSClass = event.HostOld.Status.QOSClass
+		event.HostOld.Status.QOSClass = virtualQOS
+	}
+	event.Virtual.Status.QOSClass = virtualQOS
+	if event.VirtualOld != nil {
+		event.VirtualOld.Status.QOSClass = virtualQOS
 	}
 
 	// patch objects

pkg/snapshot/controller.go

@@ -475,6 +475,11 @@ func (c *Reconciler) updateRequest(ctx context.Context, previousConfigMapState c
 	// patch snapshot request ConfigMap
 	err = c.client().Patch(ctx, configMap, previousConfigMapState)
 	if err != nil {
+		if kerrors.IsNotFound(err) {
+			// request was deleted while reconciling; nothing to update
+			c.logger.Infof("Snapshot request configMap %s/%s not found", configMap.Namespace, configMap.Name)
+			return nil
+		}
 		return fmt.Errorf("failed to patch snapshot request ConfigMap %s/%s: %w", configMap.Namespace, configMap.Name, err)
 	}
 	c.logger.Debugf("Patched snapshot request %s/%s", configMap.Namespace, configMap.Name)

pkg/snapshot/controllerbase.go

@@ -108,6 +108,11 @@ func (c *reconcilerBase) removeFinalizer(ctx context.Context, configMap *corev1.
 	// patch the object
 	err := c.client().Patch(ctx, configMap, oldConfigMap)
 	if err != nil {
+		if kerrors.IsNotFound(err) {
+			// request was deleted while reconciling; nothing to update
+			c.logger.Infof("failed to remove finalizer, configMap %s/%s not found", configMap.Namespace, configMap.Name)
+			return nil
+		}
 		return fmt.Errorf("failed to patch %s request ConfigMap %s/%s finalizers: %w", c.kind, configMap.Namespace, configMap.Name, err)
 	}
 

pkg/snapshot/volumes/csi/snapshothandler.go

@@ -255,7 +255,13 @@ func (h *snapshotHandler) deleteVolumeSnapshotResources(
 		h.logger.Debugf("Delete VolumeSnapshot %s/%s", volumeSnapshot.Namespace, volumeSnapshot.Name)
 		err := h.snapshotsClient.SnapshotV1().VolumeSnapshots(volumeSnapshot.Namespace).Delete(ctx, volumeSnapshot.Name, metav1.DeleteOptions{})
 		if err != nil && !kerrors.IsNotFound(err) {
-			return fmt.Errorf("failed to delete VolumeSnapshot %s/%s: %w", volumeSnapshot.Namespace, volumeSnapshot.Name, err)
+			// If the error is a conflict (e.g., controller is adding finalizers),
+			// it means the snapshot is being processed
+			if kerrors.IsConflict(err) {
+				h.logger.Debugf("VolumeSnapshot %s/%s deletion conflicted (likely being processed by controller), will retry", volumeSnapshot.Namespace, volumeSnapshot.Name)
+			} else {
+				return fmt.Errorf("failed to delete VolumeSnapshot %s/%s: %w", volumeSnapshot.Namespace, volumeSnapshot.Name, err)
+			}
 		}
 	}
 	if volumeSnapshotContent != nil &&