From f7de142433634ea1d77669a12c1bdaa98317ff5a Mon Sep 17 00:00:00 2001 From: Arik Hadas Date: Tue, 23 Jul 2024 17:30:53 +0300 Subject: [PATCH] Fix migration of OVA to WFFC storage classes In a2170ea we've added the following logic: when using storage classes that are set with WaitForFirstConsumer in migrations from vSphere, we treat the PendingPopulation status as Succeeded since the conversion pod would be the first consumer of the PVCs. This PR applies the same logic also to migrations from OVA providers. Signed-off-by: Arik Hadas --- pkg/controller/plan/migration.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/controller/plan/migration.go b/pkg/controller/plan/migration.go index 5aa0a63e1..69b4c748c 100644 --- a/pkg/controller/plan/migration.go +++ b/pkg/controller/plan/migration.go @@ -1506,7 +1506,9 @@ func (r *Migration) updateCopyProgress(vm *plan.VMStatus, step *plan.Step) (err if !found { continue } - if dv.Status.Phase == cdi.PendingPopulation && r.Source.Provider.Type() == v1beta1.VSphere { + if dv.Status.Phase == cdi.PendingPopulation && r.Source.Provider.RequiresConversion() { + // in migrations that involve conversion, the conversion pod serves as the + // first consumer of the PVCs so we can treat PendingPopulation as Succeeded dv.Status.Phase = cdi.Succeeded } conditions := dv.Conditions()