fix: improve logic in syncer and snapshothandler to handle e2e tests failures

Author: flomedja

pkg/controllers/resources/ingresses/syncer.go

@@ -62,15 +62,8 @@ func (s *ingressSyncer) Syncer() syncertypes.Sync[client.Object] {
 
 func (s *ingressSyncer) SyncToHost(ctx *synccontext.SyncContext, event *synccontext.SyncToHostEvent[*networkingv1.Ingress]) (ctrl.Result, error) {
 	if s.applyLimitByClass(ctx, event.Virtual) {
-		s.EventRecorder().Eventf(
-			event.Virtual,
-			nil,
-			"Warning",
-			"SyncWarning",
-			"IngressSyncWarning",
-			"did not sync ingress %q to host because it does not match the selector under 'sync.fromHost.ingressClasses.selector'",
-			event.Virtual.GetName(),
-		)
+		// applyLimitByClass already logs the appropriate error message with details
+		// (including ingress class name), so we don't need to log another message here
 		return ctrl.Result{}, nil
 	}
 

pkg/snapshot/volumes/csi/snapshothandler.go

@@ -197,6 +197,18 @@ func (h *snapshotHandler) cleanupVolumeSnapshotResource(ctx context.Context, vol
 	if volumeSnapshot == nil && volumeSnapshotContent == nil {
 		return true, nil
 	}
+	
+	// Check if resources are already being deleted (have DeletionTimestamp set)
+	// If they are, we just need to wait for them to be fully deleted
+	volumeSnapshotDeleting := volumeSnapshot != nil && !volumeSnapshot.DeletionTimestamp.IsZero()
+	volumeSnapshotContentDeleting := volumeSnapshotContent != nil && !volumeSnapshotContent.DeletionTimestamp.IsZero()
+	
+	// If all existing resources are already being deleted, wait for deletion to complete
+	if (volumeSnapshot == nil || volumeSnapshotDeleting) && (volumeSnapshotContent == nil || volumeSnapshotContentDeleting) {
+		h.logger.Debugf("VolumeSnapshot %s/%s and/or VolumeSnapshotContent are already being deleted, waiting for deletion to complete", volumeSnapshotNamespace, volumeSnapshotName)
+		return false, nil
+	}
+	
 	err = h.updateAndDeleteVolumeSnapshotResource(ctx, volumeSnapshot, volumeSnapshotContent, snapshotsv1api.VolumeSnapshotContentRetain)
 	if err != nil {
 		return false, fmt.Errorf("failed to cleanup volume snapshot resources: %w", err)