Merge branch 'release-1.12' into release-1.12

vmware-tanzu · Jan 9, 2024 · 5a178b8 · 5a178b8
2 parents 03bad25 + cf7074f
commit 5a178b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/changelogs/unreleased/7283-Lyndon-Li b/changelogs/unreleased/7283-Lyndon-Li
@@ -0,0 +1 @@
+Fix issue #6928, remove snapshot deletion timeout for PVB
diff --git a/pkg/controller/backup_deletion_controller.go b/pkg/controller/backup_deletion_controller.go
@@ -59,7 +59,6 @@ import (
 )
 
 const (
-	snapshotDeleteTimeout     = time.Minute
 	deleteBackupRequestMaxAge = 24 * time.Hour
 )
 
@@ -513,12 +512,9 @@ func (r *backupDeletionReconciler) deletePodVolumeSnapshots(ctx context.Context,
 		return []error{err}
 	}
 
-	ctx2, cancelFunc := context.WithTimeout(ctx, snapshotDeleteTimeout)
-	defer cancelFunc()
-
 	var errs []error
 	for _, snapshot := range snapshots {
-		if err := r.repoMgr.Forget(ctx2, snapshot); err != nil {
+		if err := r.repoMgr.Forget(ctx, snapshot); err != nil {
 			errs = append(errs, err)
 		}
 	}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix issue #6928, remove snapshot deletion timeout for PVB