fix conflict

Signed-off-by: Daniil Antoshin <[email protected]>

Author: danilrwx

images/virtualization-artifact/pkg/controller/service/restorer/restorers/vm_restorer.go

@@ -181,7 +181,7 @@ func (v *VirtualMachineHandler) ProcessRestore(ctx context.Context) error {
 			updErr := v.client.Update(ctx, vm)
 			if updErr != nil {
 				if apierrors.IsConflict(updErr) {
-					return fmt.Errorf("waiting for the `VirtualMachine` %w: %w", common.ErrUpdating, updErr)
+					return fmt.Errorf("waiting for the `VirtualMachine` %s: %w", vm.Name, common.ErrUpdating)
 				} else {
 					return fmt.Errorf("failed to update the `VirtualMachine`: %w", updErr)
 				}

images/virtualization-artifact/pkg/controller/service/restorer/snapshot_resources.go

@@ -22,7 +22,6 @@ import (
 	"fmt"
 
 	corev1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -211,10 +210,6 @@ var RetryErrors = []error{
 }
 
 func shouldIgnoreError(mode v1alpha2.VMOPRestoreMode, err error) bool {
-	if apierrors.IsConflict(err) {
-		return true
-	}
-
 	switch mode {
 	case v1alpha2.VMOPRestoreModeDryRun:
 		for _, e := range DryRunIgnoredErrors {