Fix DIC controller DV/PVC deletion when snapshot is ready

Signed-off-by: Arnon Gilboa <agilboa@redhat.com>

pkg/controller/dataimportcron-controller.go

@@ -724,9 +724,8 @@ func (r *DataImportCronReconciler) handleSnapshot(ctx context.Context, dataImpor
 		}
 	} else {
 		if cc.IsSnapshotReady(currentSnapshot) {
-			// Clean up PVC as that is not needed any more
-			pvc := &corev1.PersistentVolumeClaim{ObjectMeta: metav1.ObjectMeta{Name: desiredSnapshot.Name, Namespace: desiredSnapshot.Namespace}}
-			if err := r.client.Delete(ctx, pvc); err != nil && !k8serrors.IsNotFound(err) {
+			// Clean up DV/PVC as they are not needed anymore
+			if err := r.deleteDvPvc(ctx, desiredSnapshot.Name, desiredSnapshot.Namespace); err != nil {
 				return err
 			}
 		}
@@ -821,13 +820,7 @@ func (r *DataImportCronReconciler) garbageCollectPVCs(ctx context.Context, names
 			return pvcList.Items[i].Annotations[AnnLastUseTime] > pvcList.Items[j].Annotations[AnnLastUseTime]
 		})
 		for _, pvc := range pvcList.Items[maxImports:] {
-			dv := cdiv1.DataVolume{ObjectMeta: metav1.ObjectMeta{Name: pvc.Name, Namespace: pvc.Namespace}}
-			if err := r.client.Delete(ctx, &dv); err == nil {
-				continue
-			} else if !k8serrors.IsNotFound(err) {
-				return err
-			}
-			if err := r.client.Delete(ctx, &pvc); err != nil && !k8serrors.IsNotFound(err) {
+			if err := r.deleteDvPvc(ctx, pvc.Name, pvc.Namespace); err != nil {
 				return err
 			}
 		}
@@ -836,6 +829,20 @@ func (r *DataImportCronReconciler) garbageCollectPVCs(ctx context.Context, names
 	return nil
 }
 
+// deleteDvPvc deletes DV or PVC if DV was GCed
+func (r *DataImportCronReconciler) deleteDvPvc(ctx context.Context, name, namespace string) error {
+	om := metav1.ObjectMeta{Name: name, Namespace: namespace}
+	dv := &cdiv1.DataVolume{ObjectMeta: om}
+	if err := r.client.Delete(ctx, dv); err == nil || !k8serrors.IsNotFound(err) {
+		return err
+	}
+	pvc := &corev1.PersistentVolumeClaim{ObjectMeta: om}
+	if err := r.client.Delete(ctx, pvc); err != nil && !k8serrors.IsNotFound(err) {
+		return err
+	}
+	return nil
+}
+
 func (r *DataImportCronReconciler) garbageCollectSnapshots(ctx context.Context, namespace string, selector labels.Selector, maxImports int) error {
 	snapList := &snapshotv1.VolumeSnapshotList{}