fix problems)

Signed-off-by: Valeriy Khorunzhin <[email protected]>

Author: Valeriy Khorunzhin

images/virtualization-artifact/pkg/controller/cvi/internal/life_cycle.go

@@ -56,14 +56,21 @@ func (h LifeCycleHandler) Handle(ctx context.Context, cvi *virtv2.ClusterVirtual
 
 	if cvi.DeletionTimestamp != nil {
 		// It is necessary to update this condition in order to use this image as a data source.
+		cb := conditions.NewConditionBuilder(cvicondition.ReadyType).Generation(cvi.Generation)
+
 		if readyCondition.Status == metav1.ConditionTrue {
-			cb := conditions.NewConditionBuilder(cvicondition.ReadyType).Generation(cvi.Generation).
+			cb.
 				Status(metav1.ConditionTrue).
 				Reason(cvicondition.Ready).
 				Message("")
-			conditions.SetCondition(cb, &cvi.Status.Conditions)
+		} else {
+			cb.
+				Status(readyCondition.Status).
+				Reason(conditions.ReasonUnknown).
+				Message("")
 		}
 
+		conditions.SetCondition(cb, &cvi.Status.Conditions)
 		cvi.Status.Phase = virtv2.ImageTerminating
 		return reconcile.Result{}, nil
 	}

images/virtualization-artifact/pkg/controller/vd/internal/life_cycle.go

@@ -65,7 +65,6 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (r
 	}
 
 	if vd.DeletionTimestamp != nil {
-		vd.Status.Phase = virtv2.DiskTerminating
 		if readyCondition.Status == metav1.ConditionTrue {
 			cb := conditions.NewConditionBuilder(vdcondition.ReadyType).Generation(vd.Generation)
 
@@ -76,9 +75,9 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (r
 			}
 
 			source.SetPhaseConditionForFinishedDisk(pvc, cb, &vd.Status.Phase, supgen)
-
 			conditions.SetCondition(cb, &vd.Status.Conditions)
 		}
+		vd.Status.Phase = virtv2.DiskTerminating
 		return reconcile.Result{}, nil
 	}
 

images/virtualization-artifact/pkg/controller/vi/internal/life_cycle.go

@@ -62,11 +62,11 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vi *virtv2.VirtualImage) (
 		conditions.SetCondition(cb, &vi.Status.Conditions)
 	}
 
+	cb := conditions.NewConditionBuilder(vicondition.ReadyType).Generation(vi.Generation)
+
 	if vi.DeletionTimestamp != nil {
 		// It is necessary to update this condition in order to use this image as a datasource.
 		if readyCondition.Status == metav1.ConditionTrue {
-			cb := conditions.NewConditionBuilder(vicondition.ReadyType).Generation(vi.Generation)
-
 			if vi.Spec.Storage == virtv2.StorageContainerRegistry {
 				cb.
 					Status(metav1.ConditionTrue).
@@ -81,10 +81,14 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vi *virtv2.VirtualImage) (
 
 				source.SetPhaseConditionForFinishedImage(pvc, cb, &vi.Status.Phase, supgen)
 			}
-
-			conditions.SetCondition(cb, &vi.Status.Conditions)
+		} else {
+			cb.
+				Status(readyCondition.Status).
+				Reason(conditions.ReasonUnknown).
+				Message("")
 		}
 
+		conditions.SetCondition(cb, &vi.Status.Conditions)
 		vi.Status.Phase = virtv2.ImageTerminating
 		return reconcile.Result{}, nil
 	}
@@ -114,8 +118,6 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vi *virtv2.VirtualImage) (
 		return reconcile.Result{Requeue: true}, nil
 	}
 
-	cb := conditions.NewConditionBuilder(vicondition.ReadyType).Generation(vi.Generation)
-
 	// TODO: Reconciliation in source handlers for ready images should not be blocked by a missing datasource.
 	datasourceReadyCondition, _ := conditions.GetCondition(vicondition.DatasourceReadyType, vi.Status.Conditions)
 	if datasourceReadyCondition.Status != metav1.ConditionTrue || !conditions.IsLastUpdated(datasourceReadyCondition, vi) {