From adfa7ca1fbaa30835b5c7d94d92d198f46e436f4 Mon Sep 17 00:00:00 2001 From: Alex Kalenyuk Date: Tue, 9 Dec 2025 15:43:17 +0200 Subject: [PATCH] Use dedicated storage live migration condition to gauge success (#1453) * bump kubevirt api for storagelivemigratable condition bumping properly to 1.4/5.0 is a pain (requires ctrl runtime/k8s deps bump) Signed-off-by: Alex Kalenyuk * Use storage live migration condition use the storage live migration condition instead of the regular shared pvc migration condition Signed-off-by: Alex Kalenyuk --------- Signed-off-by: Alex Kalenyuk --- go.mod | 2 +- go.sum | 4 ++-- pkg/controller/directvolumemigration/rsync_test.go | 4 ++-- pkg/controller/directvolumemigration/vm.go | 2 +- pkg/controller/directvolumemigration/vm_test.go | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 9702c8770..93a83e896 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( k8s.io/apimachinery v0.30.0 k8s.io/client-go v1.5.2 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 - kubevirt.io/api v1.3.0 + kubevirt.io/api v1.3.0-beta.0.0.20240821172627-9d6ee0e9614a kubevirt.io/containerized-data-importer-api v1.59.0 sigs.k8s.io/controller-runtime v0.18.1 ) diff --git a/go.sum b/go.sum index 80481f91a..8935216a0 100644 --- a/go.sum +++ b/go.sum @@ -3221,8 +3221,8 @@ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -kubevirt.io/api v1.3.0 h1:9sGElMmnRU50pGED+MPPD2OwQl4S5lvjCUjm+t0mI90= -kubevirt.io/api v1.3.0/go.mod h1:e6LkElYZZm8NcP2gKlFVHZS9pgNhIARHIjSBSfeiP1s= +kubevirt.io/api v1.3.0-beta.0.0.20240821172627-9d6ee0e9614a h1:2i7vtLs17NWeWYyYRQ2hqfyXb/vYRIcct+FuzeWlgOQ= +kubevirt.io/api v1.3.0-beta.0.0.20240821172627-9d6ee0e9614a/go.mod h1:tCn7VAZktEvymk490iPSMPCmKM9UjbbfH2OsFR/IOLU= kubevirt.io/containerized-data-importer-api v1.59.0 h1:GdDt9BlR0qHejpMaPfASbsG8JWDmBf1s7xZBj5W9qn0= kubevirt.io/containerized-data-importer-api v1.59.0/go.mod h1:4yOGtCE7HvgKp7wftZZ3TBvDJ0x9d6N6KaRjRYcUFpE= kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 h1:QMrd0nKP0BGbnxTqakhDZAUhGKxPiPiN5gSDqKUmGGc= diff --git a/pkg/controller/directvolumemigration/rsync_test.go b/pkg/controller/directvolumemigration/rsync_test.go index e5dc68b39..7bf2dff57 100644 --- a/pkg/controller/directvolumemigration/rsync_test.go +++ b/pkg/controller/directvolumemigration/rsync_test.go @@ -1478,7 +1478,7 @@ func TestTask_updateVolumeLiveMigrationProgressStatus(t *testing.T) { Status: corev1.ConditionTrue, }, { - Type: virtv1.VirtualMachineInstanceIsMigratable, + Type: virtv1.VirtualMachineInstanceIsStorageLiveMigratable, Status: corev1.ConditionFalse, Message: "Unable to live migrate because of the test reason", }, @@ -1511,7 +1511,7 @@ func TestTask_updateVolumeLiveMigrationProgressStatus(t *testing.T) { Status: corev1.ConditionTrue, }, { - Type: virtv1.VirtualMachineInstanceIsMigratable, + Type: virtv1.VirtualMachineInstanceIsStorageLiveMigratable, Status: corev1.ConditionFalse, Message: "Unable to live migrate because of the test reason", }, diff --git a/pkg/controller/directvolumemigration/vm.go b/pkg/controller/directvolumemigration/vm.go index adb7c53fe..c6256217a 100644 --- a/pkg/controller/directvolumemigration/vm.go +++ b/pkg/controller/directvolumemigration/vm.go @@ -448,7 +448,7 @@ func virtualMachineMigrationStatus(client k8sclient.Client, vmName, namespace st if condition.Type == virtv1.VirtualMachineInstanceVolumesChange { volumeChange = condition.Status == corev1.ConditionTrue } - if condition.Type == virtv1.VirtualMachineInstanceIsMigratable { + if condition.Type == virtv1.VirtualMachineInstanceIsStorageLiveMigratable { liveMigrateable = condition.Status == corev1.ConditionTrue liveMigrateableMessage = condition.Message } diff --git a/pkg/controller/directvolumemigration/vm_test.go b/pkg/controller/directvolumemigration/vm_test.go index 52cf91d38..ebe339efd 100644 --- a/pkg/controller/directvolumemigration/vm_test.go +++ b/pkg/controller/directvolumemigration/vm_test.go @@ -492,7 +492,7 @@ func TestVirtualMachineMigrationStatus(t *testing.T) { Status: corev1.ConditionTrue, }, { - Type: virtv1.VirtualMachineInstanceIsMigratable, + Type: virtv1.VirtualMachineInstanceIsStorageLiveMigratable, Status: corev1.ConditionTrue, }, })), @@ -506,7 +506,7 @@ func TestVirtualMachineMigrationStatus(t *testing.T) { Status: corev1.ConditionTrue, }, { - Type: virtv1.VirtualMachineInstanceIsMigratable, + Type: virtv1.VirtualMachineInstanceIsStorageLiveMigratable, Status: corev1.ConditionFalse, Message: "Migration not possible", },