Don't error out if VMI is not found, instead

report not found and handle that appropriately.

Signed-off-by: Alexander Wels <awels@redhat.com>

Author: awels

pkg/controller/directvolumemigration/rsync.go

@@ -1704,6 +1704,9 @@ func (t *Task) updateVolumeLiveMigrationProgressStatus(volumeName, namespace str
 			return err
 		}
 		liveMigrationProgress.VMName = vmName
+		if message == vmiNotFound {
+			return nil
+		}
 		if message != "" {
 			vmMatchString := fmt.Sprintf("%s/%s", namespace, vmName)
 			liveMigrationProgress.Message = message

pkg/controller/directvolumemigration/vm.go

@@ -44,6 +44,7 @@ const (
 	virtLauncherPodLabelSelectorValue = "virt-launcher"
 	defaultVirtStorageClass           = "storageclass.kubevirt.io/is-default-virt-class"
 	defaultK8sStorageClass            = "storageclass.kubernetes.io/is-default-class"
+	vmiNotFound                       = "not found"
 )
 
 var (
@@ -438,7 +439,7 @@ func virtualMachineMigrationStatus(client k8sclient.Client, vmName, namespace st
 		if !k8serrors.IsNotFound(err) {
 			return err.Error(), err
 		}
-		return fmt.Sprintf("VMI %s not found in namespace %s", vmName, namespace), err
+		return vmiNotFound, nil
 	}
 	volumeChange := false
 	liveMigrateable := false

pkg/controller/directvolumemigration/vm_test.go

@@ -445,14 +445,14 @@ func TestVirtualMachineMigrationStatus(t *testing.T) {
 		{
 			name:           "In progress VMIM",
 			client:         getFakeClientWithObjs(createInProgressVirtualMachineMigration("vmim", testNamespace, "vm")),
-			expectedStatus: fmt.Sprintf("VMI %s not found in namespace %s", "vm", testNamespace),
-			wantErr:        true,
+			expectedStatus: vmiNotFound,
+			wantErr:        false,
 		},
 		{
 			name:           "No VMIM or VMI",
 			client:         getFakeClientWithObjs(),
-			expectedStatus: fmt.Sprintf("VMI %s not found in namespace %s", "vm", testNamespace),
-			wantErr:        true,
+			expectedStatus: vmiNotFound,
+			wantErr:        false,
 		},
 		{
 			name:           "Failed VMIM with message",