CSI clone and Cloning from snapshot source functional tests

Signed-off-by: Ido Aharon <iaharon@redhat.com>
kubevirt · Mar 2, 2023 · dbc9997 · dbc9997
1 parent 77ceb4d
commit dbc9997
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/pkg/controller/datavolume/controller-base.go b/pkg/controller/datavolume/controller-base.go
@@ -314,7 +314,6 @@ type dvController interface {
 	updateStatusPhase(pvc *corev1.PersistentVolumeClaim, dataVolumeCopy *cdiv1.DataVolume, event *Event) error
 }
 
-<<<<<<< HEAD
 func (r *ReconcilerBase) reconcile(ctx context.Context, req reconcile.Request, dvc dvController) (reconcile.Result, error) {
 	log := r.log.WithValues("DataVolume", req.NamespacedName)
 	syncRes, syncErr := dvc.sync(log, req)
@@ -341,15 +340,6 @@ func (r *ReconcilerBase) syncCommon(log logr.Logger, req reconcile.Request, clea
 func (r *ReconcilerBase) syncDvPvcState(log logr.Logger, req reconcile.Request, cleanup, prepare dvSyncStateFunc) (dvSyncState, error) {
 	syncState := dvSyncState{}
 	dv, err := r.getDataVolume(req.NamespacedName)
-=======
-func (r ReconcilerBase) sync(log logr.Logger, req reconcile.Request, cleanup, prepare dataVolumeSyncResultFunc) (*dataVolumeSyncResult, error) {
-	syncRes := &dataVolumeSyncResult{}
-<<<<<<< HEAD
-	dv, err := getDataVolume(r.client, req.NamespacedName)
->>>>>>> 67bd1f823 (Rebase and add utests)
-=======
-	dv, err := r.getDataVolume(req.NamespacedName)
->>>>>>> 3f19b15ae (Transferring annotations in smart clone and passing dv instead of client)
 	if dv == nil || err != nil {
 		syncState.result = &reconcile.Result{}
 		return syncState, err