diff --git a/pkg/controller/backup_sync_controller.go b/pkg/controller/backup_sync_controller.go index a6dd930b7..b80ae82e9 100644 --- a/pkg/controller/backup_sync_controller.go +++ b/pkg/controller/backup_sync_controller.go @@ -42,7 +42,6 @@ import ( "github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt" "github.com/vmware-tanzu/velero/pkg/util/kube" - corev1api "k8s.io/api/core/v1" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -263,44 +262,6 @@ func (b *backupSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request) log.Infof("Created CSI VolumeSnapshotClass %s", vsClass.Name) } } - - log.Info("Syncing CSI volumesnapshotcontents in backup") - snapConts, err := backupStore.GetCSIVolumeSnapshotContents(backupName) - if err != nil { - log.WithError(errors.WithStack(err)).Error("Error getting CSI volumesnapshotcontents for this backup from backup store") - continue - } - - log.Infof("Syncing %d CSI volumesnapshotcontents in backup", len(snapConts)) - for _, snapCont := range snapConts { - // TODO: Reset ResourceVersion prior to persisting VolumeSnapshotContents - snapCont.ResourceVersion = "" - // Make the VolumeSnapshotContent static - snapCont.Spec.Source = snapshotv1api.VolumeSnapshotContentSource{ - SnapshotHandle: snapCont.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. - snapCont.Spec.VolumeSnapshotRef = corev1api.ObjectReference{ - APIVersion: snapshotv1api.SchemeGroupVersion.String(), - Kind: "VolumeSnapshot", - Namespace: "ns-" + string(snapCont.UID), - Name: "name-" + string(snapCont.UID), - } - err := b.client.Create(ctx, snapCont, &client.CreateOptions{}) - switch { - case err != nil && apierrors.IsAlreadyExists(err): - log.Debugf("volumesnapshotcontent %s already exists in cluster", snapCont.Name) - continue - case err != nil && !apierrors.IsAlreadyExists(err): - log.WithError(errors.WithStack(err)).Errorf("Error syncing volumesnapshotcontent %s into cluster", snapCont.Name) - continue - default: - log.Infof("Created CSI volumesnapshotcontent %s", snapCont.Name) - } - } } }