Merge pull request #6327 from blackpiglet/6099_fix

Remove Wait VolumeSnapshot to ReadyToUse logic.

changelogs/unreleased/6327-blackpiglet

@@ -0,0 +1 @@
+Remove Wait VolumeSnapshot to ReadyToUse logic.

go.mod

@@ -38,7 +38,6 @@ require (
 	golang.org/x/mod v0.10.0
 	golang.org/x/net v0.9.0
 	golang.org/x/oauth2 v0.7.0
-	golang.org/x/sync v0.1.0
 	golang.org/x/text v0.9.0
 	google.golang.org/api v0.120.0
 	google.golang.org/grpc v1.54.0
@@ -141,6 +140,7 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.8.0 // indirect
 	golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f // indirect
+	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/sys v0.7.0 // indirect
 	golang.org/x/term v0.7.0 // indirect
 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect

pkg/apis/velero/v1/labels_annotations.go

@@ -71,4 +71,8 @@ const (
 	// SourceClusterK8sMajorVersionAnnotation is the label key used to identify the k8s
 	// minor version of the backup , i.e. 16
 	SourceClusterK8sMinorVersionAnnotation = "velero.io/source-cluster-k8s-minor-version"
+
+	// ResourceTimeoutAnnotation is the annotation key used to carry the global resource
+	// timeout value for backup to plugins.
+	ResourceTimeoutAnnotation = "velero.io/resource-timeout"
 )

pkg/controller/backup_controller.go

@@ -21,7 +21,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"sync"
 	"time"
 
 	snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
@@ -29,7 +28,6 @@ import (
 	snapshotv1listers "github.com/kubernetes-csi/external-snapshotter/client/v4/listers/volumesnapshot/v1"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/sync/errgroup"
 	corev1api "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -55,7 +53,6 @@ import (
 	"github.com/vmware-tanzu/velero/pkg/plugin/framework"
 	"github.com/vmware-tanzu/velero/pkg/util/boolptr"
 	"github.com/vmware-tanzu/velero/pkg/util/collections"
-	"github.com/vmware-tanzu/velero/pkg/util/csi"
 	"github.com/vmware-tanzu/velero/pkg/util/encode"
 	kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
 	"github.com/vmware-tanzu/velero/pkg/util/logging"
@@ -420,6 +417,7 @@ func (b *backupReconciler) prepareBackupRequest(backup *velerov1api.Backup, logg
 	request.Annotations[velerov1api.SourceClusterK8sGitVersionAnnotation] = b.discoveryHelper.ServerVersion().String()
 	request.Annotations[velerov1api.SourceClusterK8sMajorVersionAnnotation] = b.discoveryHelper.ServerVersion().Major
 	request.Annotations[velerov1api.SourceClusterK8sMinorVersionAnnotation] = b.discoveryHelper.ServerVersion().Minor
+	request.Annotations[velerov1api.ResourceTimeoutAnnotation] = b.resourceTimeout.String()
 
 	// Add namespaces with label velero.io/exclude-from-backup=true into request.Spec.ExcludedNamespaces
 	// Essentially, adding the label velero.io/exclude-from-backup=true to a namespace would be equivalent to setting spec.ExcludedNamespaces
@@ -654,9 +652,14 @@ func (b *backupReconciler) runBackup(backup *pkgbackup.Request) error {
 		selector := label.NewSelectorForBackup(backup.Name)
 		vscList := &snapshotv1api.VolumeSnapshotContentList{}
 
-		volumeSnapshots, err = b.waitVolumeSnapshotReadyToUse(context.Background(), backup.Spec.CSISnapshotTimeout.Duration, backup.Name)
-		if err != nil {
-			backupLog.Errorf("fail to wait VolumeSnapshot change to Ready: %s", err.Error())
+		if b.volumeSnapshotLister != nil {
+			tmpVSs, err := b.volumeSnapshotLister.List(label.NewSelectorForBackup(backup.Name))
+			if err != nil {
+				backupLog.Error(err)
+			}
+			for _, vs := range tmpVSs {
+				volumeSnapshots = append(volumeSnapshots, *vs)
+			}
 		}
 
 		backup.CSISnapshots = volumeSnapshots
@@ -681,15 +684,6 @@ func (b *backupReconciler) runBackup(backup *pkgbackup.Request) error {
 					volumeSnapshotClasses = append(volumeSnapshotClasses, *vsClass)
 				}
 			}
-
-			if err := csi.ResetVolumeSnapshotContent(&volumeSnapshotContents[index]); err != nil {
-				backupLog.Error(err)
-			}
-		}
-
-		// Delete the VolumeSnapshots created in the backup, when CSI feature is enabled.
-		if len(volumeSnapshots) > 0 && len(volumeSnapshotContents) > 0 {
-			b.deleteVolumeSnapshots(volumeSnapshots, volumeSnapshotContents, backupLog, b.maxConcurrentK8SConnections)
 		}
 	}
 
@@ -929,216 +923,6 @@ func closeAndRemoveFile(file *os.File, log logrus.FieldLogger) {
 	}
 }
 
-// waitVolumeSnapshotReadyToUse is used to wait VolumeSnapshot turned to ReadyToUse.
-// Waiting for VolumeSnapshot ReadyToUse to true is time consuming. Try to make the process parallel by
-// using goroutine here instead of waiting in CSI plugin, because it's not easy to make BackupItemAction
-// parallel by now. After BackupItemAction parallel is implemented, this logic should be moved to CSI plugin
-// as https://github.com/vmware-tanzu/velero-plugin-for-csi/pull/100
-func (b *backupReconciler) waitVolumeSnapshotReadyToUse(ctx context.Context,
-	csiSnapshotTimeout time.Duration, backupName string) ([]snapshotv1api.VolumeSnapshot, error) {
-	eg, _ := errgroup.WithContext(ctx)
-	timeout := csiSnapshotTimeout
-	interval := 5 * time.Second
-	volumeSnapshots := make([]snapshotv1api.VolumeSnapshot, 0)
-
-	if b.volumeSnapshotLister != nil {
-		tmpVSs, err := b.volumeSnapshotLister.List(label.NewSelectorForBackup(backupName))
-		if err != nil {
-			b.logger.Error(err)
-			return volumeSnapshots, err
-		}
-		for _, vs := range tmpVSs {
-			volumeSnapshots = append(volumeSnapshots, *vs)
-		}
-	}
-
-	vsChannel := make(chan snapshotv1api.VolumeSnapshot, len(volumeSnapshots))
-	defer close(vsChannel)
-
-	for index := range volumeSnapshots {
-		volumeSnapshot := volumeSnapshots[index]
-		eg.Go(func() error {
-			err := wait.PollImmediate(interval, timeout, func() (bool, error) {
-				tmpVS, err := b.volumeSnapshotClient.SnapshotV1().VolumeSnapshots(volumeSnapshot.Namespace).Get(b.ctx, volumeSnapshot.Name, metav1.GetOptions{})
-				if err != nil {
-					return false, errors.Wrapf(err, fmt.Sprintf("failed to get volumesnapshot %s/%s", volumeSnapshot.Namespace, volumeSnapshot.Name))
-				}
-				if tmpVS.Status == nil || tmpVS.Status.BoundVolumeSnapshotContentName == nil || !boolptr.IsSetToTrue(tmpVS.Status.ReadyToUse) {
-					b.logger.Infof("Waiting for CSI driver to reconcile volumesnapshot %s/%s. Retrying in %ds", volumeSnapshot.Namespace, volumeSnapshot.Name, interval/time.Second)
-					return false, nil
-				}
-
-				b.logger.Debugf("VolumeSnapshot %s/%s turned into ReadyToUse.", volumeSnapshot.Namespace, volumeSnapshot.Name)
-				// Put the ReadyToUse VolumeSnapshot element in the result channel.
-				vsChannel <- *tmpVS
-				return true, nil
-			})
-			if err == wait.ErrWaitTimeout {
-				b.logger.Errorf("Timed out awaiting reconciliation of volumesnapshot %s/%s", volumeSnapshot.Namespace, volumeSnapshot.Name)
-			}
-			return err
-		})
-	}
-
-	err := eg.Wait()
-
-	result := make([]snapshotv1api.VolumeSnapshot, 0)
-	length := len(vsChannel)
-	for index := 0; index < length; index++ {
-		result = append(result, <-vsChannel)
-	}
-
-	return result, err
-}
-
-// deleteVolumeSnapshots delete VolumeSnapshot created during backup.
-// This is used to avoid deleting namespace in cluster triggers the VolumeSnapshot deletion,
-// which will cause snapshot deletion on cloud provider, then backup cannot restore the PV.
-// If DeletionPolicy is Retain, just delete it. If DeletionPolicy is Delete, need to
-// change DeletionPolicy to Retain before deleting VS, then change DeletionPolicy back to Delete.
-func (b *backupReconciler) deleteVolumeSnapshots(volumeSnapshots []snapshotv1api.VolumeSnapshot,
-	volumeSnapshotContents []snapshotv1api.VolumeSnapshotContent,
-	logger logrus.FieldLogger, maxConcurrent int) {
-	var wg sync.WaitGroup
-	vscMap := make(map[string]snapshotv1api.VolumeSnapshotContent)
-	for _, vsc := range volumeSnapshotContents {
-		vscMap[vsc.Name] = vsc
-	}
-
-	ch := make(chan snapshotv1api.VolumeSnapshot, maxConcurrent)
-	defer func() {
-		if _, ok := <-ch; ok {
-			close(ch)
-		}
-	}()
-
-	wg.Add(maxConcurrent)
-	for i := 0; i < maxConcurrent; i++ {
-		go func() {
-			for {
-				vs, ok := <-ch
-				if !ok {
-					wg.Done()
-					return
-				}
-				b.deleteVolumeSnapshot(vs, vscMap, logger)
-			}
-		}()
-	}
-
-	for _, vs := range volumeSnapshots {
-		ch <- vs
-	}
-	close(ch)
-
-	wg.Wait()
-}
-
-// deleteVolumeSnapshot is called by deleteVolumeSnapshots and handles the single VolumeSnapshot
-// instance.
-func (b *backupReconciler) deleteVolumeSnapshot(vs snapshotv1api.VolumeSnapshot, vscMap map[string]snapshotv1api.VolumeSnapshotContent, logger logrus.FieldLogger) {
-	var vsc snapshotv1api.VolumeSnapshotContent
-	modifyVSCFlag := false
-	if vs.Status != nil &&
-		vs.Status.BoundVolumeSnapshotContentName != nil &&
-		len(*vs.Status.BoundVolumeSnapshotContentName) > 0 {
-		var found bool
-		if vsc, found = vscMap[*vs.Status.BoundVolumeSnapshotContentName]; !found {
-			logger.Errorf("Not find %s from the vscMap", *vs.Status.BoundVolumeSnapshotContentName)
-			return
-		}
-
-		if vsc.Spec.DeletionPolicy == snapshotv1api.VolumeSnapshotContentDelete {
-			modifyVSCFlag = true
-		}
-	} else {
-		logger.Errorf("VolumeSnapshot %s/%s is not ready. This is not expected.", vs.Namespace, vs.Name)
-	}
-
-	// Change VolumeSnapshotContent's DeletionPolicy to Retain before deleting VolumeSnapshot,
-	// because VolumeSnapshotContent will be deleted by deleting VolumeSnapshot, when
-	// DeletionPolicy is set to Delete, but Velero needs VSC for cleaning snapshot on cloud
-	// in backup deletion.
-	if modifyVSCFlag {
-		logger.Debugf("Patching VolumeSnapshotContent %s", vsc.Name)
-		original := vsc.DeepCopy()
-		vsc.Spec.DeletionPolicy = snapshotv1api.VolumeSnapshotContentRetain
-		if err := b.kbClient.Patch(context.Background(), &vsc, kbclient.MergeFrom(original)); err != nil {
-			logger.Errorf("fail to modify VolumeSnapshotContent %s DeletionPolicy to Retain: %s", vsc.Name, err.Error())
-			return
-		}
-
-		defer func() {
-			logger.Debugf("Start to recreate VolumeSnapshotContent %s", vsc.Name)
-			err := b.recreateVolumeSnapshotContent(vsc)
-			if err != nil {
-				logger.Errorf("fail to recreate VolumeSnapshotContent %s: %s", vsc.Name, err.Error())
-			}
-		}()
-	}
-
-	// Delete VolumeSnapshot from cluster
-	logger.Debugf("Deleting VolumeSnapshot %s/%s", vs.Namespace, vs.Name)
-	err := b.volumeSnapshotClient.SnapshotV1().VolumeSnapshots(vs.Namespace).Delete(context.TODO(), vs.Name, metav1.DeleteOptions{})
-	if err != nil {
-		logger.Errorf("fail to delete VolumeSnapshot %s/%s: %s", vs.Namespace, vs.Name, err.Error())
-	}
-}
-
-// recreateVolumeSnapshotContent will delete then re-create VolumeSnapshotContent,
-// because some parameter in VolumeSnapshotContent Spec is immutable, e.g. VolumeSnapshotRef
-// and Source. Source is updated to let csi-controller thinks the VSC is statically provsisioned with VS.
-// Set VolumeSnapshotRef's UID to nil will let the csi-controller finds out the related VS is gone, then
-// VSC can be deleted.
-func (b *backupReconciler) recreateVolumeSnapshotContent(vsc snapshotv1api.VolumeSnapshotContent) error {
-	timeout := b.resourceTimeout
-	interval := 1 * time.Second
-
-	err := b.kbClient.Delete(context.TODO(), &vsc)
-	if err != nil {
-		return errors.Wrapf(err, "fail to delete VolumeSnapshotContent: %s", vsc.Name)
-	}
-
-	// Check VolumeSnapshotContents is already deleted, before re-creating it.
-	err = wait.PollImmediate(interval, timeout, func() (bool, error) {
-		tmpVSC := &snapshotv1api.VolumeSnapshotContent{}
-		err := b.kbClient.Get(context.TODO(), kbclient.ObjectKey{Name: vsc.Name}, tmpVSC)
-		if err != nil {
-			if apierrors.IsNotFound(err) {
-				return true, nil
-			}
-			return false, errors.Wrapf(err, fmt.Sprintf("failed to get VolumeSnapshotContent %s", vsc.Name))
-		}
-		return false, nil
-	})
-	if err != nil {
-		return errors.Wrapf(err, "fail to retrieve VolumeSnapshotContent %s info", vsc.Name)
-	}
-
-	// Make the VolumeSnapshotContent static
-	vsc.Spec.Source = snapshotv1api.VolumeSnapshotContentSource{
-		SnapshotHandle: vsc.Status.SnapshotHandle,
-	}
-	// Set VolumeSnapshotRef to none exist one, because VolumeSnapshotContent
-	// validation webhook will check whether name and namespace are nil.
-	// external-snapshotter needs Source pointing to snapshot and VolumeSnapshot
-	// reference's UID to nil to determine the VolumeSnapshotContent is deletable.
-	vsc.Spec.VolumeSnapshotRef = corev1api.ObjectReference{
-		APIVersion: snapshotv1api.SchemeGroupVersion.String(),
-		Kind:       "VolumeSnapshot",
-		Namespace:  "ns-" + string(vsc.UID),
-		Name:       "name-" + string(vsc.UID),
-	}
-	// ResourceVersion shouldn't exist for new creation.
-	vsc.ResourceVersion = ""
-	err = b.kbClient.Create(context.TODO(), &vsc)
-	if err != nil {
-		return errors.Wrapf(err, "fail to create VolumeSnapshotContent %s", vsc.Name)
-	}
-
-	return nil
-}
-
 func oldAndNewFilterParametersUsedTogether(backupSpec velerov1api.BackupSpec) bool {
 	haveOldResourceFilterParameters := len(backupSpec.IncludedResources) > 0 ||
 		(len(backupSpec.ExcludedResources) > 0) ||

pkg/controller/backup_controller_test.go

@@ -26,9 +26,6 @@ import (
 	"testing"
 	"time"
 
-	snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
-	snapshotfake "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/fake"
-	snapshotinformers "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
@@ -603,6 +600,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 						"velero.io/source-cluster-k8s-major-version": "1",
 						"velero.io/source-cluster-k8s-minor-version": "16",
 						"velero.io/source-cluster-k8s-gitversion":    "v1.16.4",
+						"velero.io/resource-timeout":                 "0s",
 					},
 					Labels: map[string]string{
 						"velero.io/storage-location": "loc-1",
@@ -638,6 +636,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 						"velero.io/source-cluster-k8s-major-version": "1",
 						"velero.io/source-cluster-k8s-minor-version": "16",
 						"velero.io/source-cluster-k8s-gitversion":    "v1.16.4",
+						"velero.io/resource-timeout":                 "0s",
 					},
 					Labels: map[string]string{
 						"velero.io/storage-location": "alt-loc",
@@ -676,6 +675,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 						"velero.io/source-cluster-k8s-major-version": "1",
 						"velero.io/source-cluster-k8s-minor-version": "16",
 						"velero.io/source-cluster-k8s-gitversion":    "v1.16.4",
+						"velero.io/resource-timeout":                 "0s",
 					},
 					Labels: map[string]string{
 						"velero.io/storage-location": "read-write",
@@ -711,6 +711,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 						"velero.io/source-cluster-k8s-major-version": "1",
 						"velero.io/source-cluster-k8s-minor-version": "16",
 						"velero.io/source-cluster-k8s-gitversion":    "v1.16.4",
+						"velero.io/resource-timeout":                 "0s",
 					},
 					Labels: map[string]string{
 						"velero.io/storage-location": "loc-1",
@@ -748,6 +749,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 						"velero.io/source-cluster-k8s-major-version": "1",
 						"velero.io/source-cluster-k8s-minor-version": "16",
 						"velero.io/source-cluster-k8s-gitversion":    "v1.16.4",
+						"velero.io/resource-timeout":                 "0s",
 					},
 					Labels: map[string]string{
 						"velero.io/storage-location": "loc-1",
@@ -785,6 +787,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 						"velero.io/source-cluster-k8s-major-version": "1",
 						"velero.io/source-cluster-k8s-minor-version": "16",
 						"velero.io/source-cluster-k8s-gitversion":    "v1.16.4",
+						"velero.io/resource-timeout":                 "0s",
 					},
 					Labels: map[string]string{
 						"velero.io/storage-location": "loc-1",
@@ -822,6 +825,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 						"velero.io/source-cluster-k8s-major-version": "1",
 						"velero.io/source-cluster-k8s-minor-version": "16",
 						"velero.io/source-cluster-k8s-gitversion":    "v1.16.4",
+						"velero.io/resource-timeout":                 "0s",
 					},
 					Labels: map[string]string{
 						"velero.io/storage-location": "loc-1",
@@ -859,6 +863,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 						"velero.io/source-cluster-k8s-major-version": "1",
 						"velero.io/source-cluster-k8s-minor-version": "16",
 						"velero.io/source-cluster-k8s-gitversion":    "v1.16.4",
+						"velero.io/resource-timeout":                 "0s",
 					},
 					Labels: map[string]string{
 						"velero.io/storage-location": "loc-1",
@@ -896,6 +901,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 						"velero.io/source-cluster-k8s-major-version": "1",
 						"velero.io/source-cluster-k8s-minor-version": "16",
 						"velero.io/source-cluster-k8s-gitversion":    "v1.16.4",
+						"velero.io/resource-timeout":                 "0s",
 					},
 					Labels: map[string]string{
 						"velero.io/storage-location": "loc-1",
@@ -934,6 +940,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 						"velero.io/source-cluster-k8s-major-version": "1",
 						"velero.io/source-cluster-k8s-minor-version": "16",
 						"velero.io/source-cluster-k8s-gitversion":    "v1.16.4",
+						"velero.io/resource-timeout":                 "0s",
 					},
 					Labels: map[string]string{
 						"velero.io/storage-location": "loc-1",
@@ -972,6 +979,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 						"velero.io/source-cluster-k8s-major-version": "1",
 						"velero.io/source-cluster-k8s-minor-version": "16",
 						"velero.io/source-cluster-k8s-gitversion":    "v1.16.4",
+						"velero.io/resource-timeout":                 "0s",
 					},
 					Labels: map[string]string{
 						"velero.io/storage-location": "loc-1",
@@ -1373,111 +1381,3 @@ func Test_getLastSuccessBySchedule(t *testing.T) {
 		})
 	}
 }
-
-func TestDeleteVolumeSnapshots(t *testing.T) {
-	tests := []struct {
-		name             string
-		vsArray          []snapshotv1api.VolumeSnapshot
-		vscArray         []snapshotv1api.VolumeSnapshotContent
-		expectedVSArray  []snapshotv1api.VolumeSnapshot
-		expectedVSCArray []snapshotv1api.VolumeSnapshotContent
-	}{
-		{
-			name: "VS is ReadyToUse, and VS has corresponding VSC. VS should be deleted.",
-			vsArray: []snapshotv1api.VolumeSnapshot{
-				*builder.ForVolumeSnapshot("velero", "vs1").ObjectMeta(builder.WithLabels("testing-vs", "vs1")).Status().BoundVolumeSnapshotContentName("vsc1").Result(),
-			},
-			vscArray: []snapshotv1api.VolumeSnapshotContent{
-				*builder.ForVolumeSnapshotContent("vsc1").DeletionPolicy(snapshotv1api.VolumeSnapshotContentDelete).Status().Result(),
-			},
-			expectedVSArray: []snapshotv1api.VolumeSnapshot{},
-			expectedVSCArray: []snapshotv1api.VolumeSnapshotContent{
-				*builder.ForVolumeSnapshotContent("vsc1").DeletionPolicy(snapshotv1api.VolumeSnapshotContentRetain).VolumeSnapshotRef("ns-", "name-").Status().Result(),
-			},
-		},
-		{
-			name: "VS is ReadyToUse, and VS has corresponding VSC. Concurrent test.",
-			vsArray: []snapshotv1api.VolumeSnapshot{
-				*builder.ForVolumeSnapshot("velero", "vs1").ObjectMeta(builder.WithLabels("testing-vs", "vs1")).Status().BoundVolumeSnapshotContentName("vsc1").Result(),
-				*builder.ForVolumeSnapshot("velero", "vs2").ObjectMeta(builder.WithLabels("testing-vs", "vs2")).Status().BoundVolumeSnapshotContentName("vsc2").Result(),
-				*builder.ForVolumeSnapshot("velero", "vs3").ObjectMeta(builder.WithLabels("testing-vs", "vs3")).Status().BoundVolumeSnapshotContentName("vsc3").Result(),
-			},
-			vscArray: []snapshotv1api.VolumeSnapshotContent{
-				*builder.ForVolumeSnapshotContent("vsc1").DeletionPolicy(snapshotv1api.VolumeSnapshotContentDelete).Status().Result(),
-				*builder.ForVolumeSnapshotContent("vsc2").DeletionPolicy(snapshotv1api.VolumeSnapshotContentDelete).Status().Result(),
-				*builder.ForVolumeSnapshotContent("vsc3").DeletionPolicy(snapshotv1api.VolumeSnapshotContentDelete).Status().Result(),
-			},
-			expectedVSArray: []snapshotv1api.VolumeSnapshot{},
-			expectedVSCArray: []snapshotv1api.VolumeSnapshotContent{
-				*builder.ForVolumeSnapshotContent("vsc1").DeletionPolicy(snapshotv1api.VolumeSnapshotContentRetain).VolumeSnapshotRef("ns-", "name-").Status().Result(),
-				*builder.ForVolumeSnapshotContent("vsc2").DeletionPolicy(snapshotv1api.VolumeSnapshotContentRetain).VolumeSnapshotRef("ns-", "name-").Status().Result(),
-				*builder.ForVolumeSnapshotContent("vsc3").DeletionPolicy(snapshotv1api.VolumeSnapshotContentRetain).VolumeSnapshotRef("ns-", "name-").Status().Result(),
-			},
-		},
-		{
-			name: "Corresponding VSC not found for VS. VS is not deleted.",
-			vsArray: []snapshotv1api.VolumeSnapshot{
-				*builder.ForVolumeSnapshot("velero", "vs1").ObjectMeta(builder.WithLabels("testing-vs", "vs1")).Status().BoundVolumeSnapshotContentName("vsc1").Result(),
-			},
-			vscArray: []snapshotv1api.VolumeSnapshotContent{},
-			expectedVSArray: []snapshotv1api.VolumeSnapshot{
-				*builder.ForVolumeSnapshot("velero", "vs1").Status().BoundVolumeSnapshotContentName("vsc1").Result(),
-			},
-			expectedVSCArray: []snapshotv1api.VolumeSnapshotContent{},
-		},
-		{
-			name: "VS status is nil. VSC should not be modified.",
-			vsArray: []snapshotv1api.VolumeSnapshot{
-				*builder.ForVolumeSnapshot("velero", "vs1").ObjectMeta(builder.WithLabels("testing-vs", "vs1")).Result(),
-			},
-			vscArray: []snapshotv1api.VolumeSnapshotContent{
-				*builder.ForVolumeSnapshotContent("vsc1").DeletionPolicy(snapshotv1api.VolumeSnapshotContentDelete).Status().Result(),
-			},
-			expectedVSArray: []snapshotv1api.VolumeSnapshot{},
-			expectedVSCArray: []snapshotv1api.VolumeSnapshotContent{
-				*builder.ForVolumeSnapshotContent("vsc1").DeletionPolicy(snapshotv1api.VolumeSnapshotContentDelete).Status().Result(),
-			},
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			var (
-				fakeClient = velerotest.NewFakeControllerRuntimeClientBuilder(t).WithLists(
-					&snapshotv1api.VolumeSnapshotContentList{Items: tc.vscArray},
-				).Build()
-				vsClient        = snapshotfake.NewSimpleClientset()
-				sharedInformers = snapshotinformers.NewSharedInformerFactory(vsClient, 0)
-			)
-			c := &backupReconciler{
-				kbClient:             fakeClient,
-				volumeSnapshotLister: sharedInformers.Snapshot().V1().VolumeSnapshots().Lister(),
-				volumeSnapshotClient: vsClient,
-			}
-
-			for _, vs := range tc.vsArray {
-				_, err := c.volumeSnapshotClient.SnapshotV1().VolumeSnapshots(vs.Namespace).Create(context.Background(), &vs, metav1.CreateOptions{})
-				require.NoError(t, err)
-				require.NoError(t, sharedInformers.Snapshot().V1().VolumeSnapshots().Informer().GetStore().Add(&vs))
-			}
-			logger := logging.DefaultLogger(logrus.DebugLevel, logging.FormatText)
-
-			c.deleteVolumeSnapshots(tc.vsArray, tc.vscArray, logger, 30)
-
-			vsList, err := c.volumeSnapshotClient.SnapshotV1().VolumeSnapshots("velero").List(context.TODO(), metav1.ListOptions{})
-			require.NoError(t, err)
-			assert.Equal(t, len(tc.expectedVSArray), len(vsList.Items))
-			for index := range tc.expectedVSArray {
-				assert.Equal(t, tc.expectedVSArray[index].Status, vsList.Items[index].Status)
-				assert.Equal(t, tc.expectedVSArray[index].Spec, vsList.Items[index].Spec)
-			}
-
-			vscList := &snapshotv1api.VolumeSnapshotContentList{}
-			require.NoError(t, c.kbClient.List(context.Background(), vscList))
-			assert.Equal(t, len(tc.expectedVSCArray), len(vscList.Items))
-			for index := range tc.expectedVSCArray {
-				assert.Equal(t, tc.expectedVSCArray[index].Spec, vscList.Items[index].Spec)
-			}
-		})
-	}
-}

pkg/util/csi/reset.go

@@ -1,46 +0,0 @@
-/*
-Copyright The Velero Contributors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package csi
-
-import (
-	"fmt"
-
-	snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
-	corev1 "k8s.io/api/core/v1"
-)
-
-// ResetVolumeSnapshotContent make changes to the volumesnapshot content before it's persisted
-// It will move the snapshot Handle to the source to avoid the snapshot-controller creating a snapshot when it's
-// synced by the backup sync controller.
-// It will return an error if the snapshot handle is not set, which should not happen when this func is called.
-func ResetVolumeSnapshotContent(snapCont *snapshotv1api.VolumeSnapshotContent) error {
-	if snapCont.Status != nil && snapCont.Status.SnapshotHandle != nil && len(*snapCont.Status.SnapshotHandle) > 0 {
-		v := *snapCont.Status.SnapshotHandle
-		snapCont.Spec.Source = snapshotv1api.VolumeSnapshotContentSource{
-			SnapshotHandle: &v,
-		}
-	} else {
-		return fmt.Errorf("the volumesnapshotcontent '%s' does not have snapshothandle set", snapCont.Name)
-	}
-
-	// set the VolumeSnapshotRef to non-existing one to bypass the validation webhook
-	snapCont.Spec.VolumeSnapshotRef = corev1.ObjectReference{
-		Namespace: fmt.Sprintf("ns-%s", snapCont.UID),
-		Name:      fmt.Sprintf("name-%s", snapCont.UID),
-	}
-	return nil
-}