Merge pull request vmware-tanzu#266 from sseago/vsc-deletion2

Use resource timeout with deleteVolumeSnapshots
kaovilai · May 9, 2023 · 31f3427 · 31f3427
2 parents 53a2aa9 + 7223c39
commit 31f3427
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go
@@ -815,6 +815,7 @@ func (s *server) runControllers(defaultVolumeSnapshotLocations map[string]string
 			s.metrics,
 			s.csiSnapshotLister,
 			s.csiSnapshotClient,
+			s.config.resourceTimeout,
 		)
 		if err := r.SetupWithManager(s.mgr); err != nil {
 			s.logger.Fatal(err, "unable to create controller", "controller", controller.BackupFinalizer)

diff --git a/pkg/controller/backup_finalizer_controller.go b/pkg/controller/backup_finalizer_controller.go
@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"context"
 	"os"
+	"time"
 
 	snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	snapshotterClientSet "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned"
@@ -57,6 +58,7 @@ type backupFinalizerReconciler struct {
 	log                  logrus.FieldLogger
 	volumeSnapshotLister snapshotv1listers.VolumeSnapshotLister
 	volumeSnapshotClient snapshotterClientSet.Interface
+	resourceTimeout      time.Duration
 }
 
 // NewBackupFinalizerReconciler initializes and returns backupFinalizerReconciler struct.
@@ -72,6 +74,7 @@ func NewBackupFinalizerReconciler(
 	metrics *metrics.ServerMetrics,
 	volumeSnapshotLister snapshotv1listers.VolumeSnapshotLister,
 	volumeSnapshotClient snapshotterClientSet.Interface,
+	resourceTimeout time.Duration,
 ) *backupFinalizerReconciler {
 	return &backupFinalizerReconciler{
 		ctx:                  ctx,
@@ -85,6 +88,7 @@ func NewBackupFinalizerReconciler(
 		metrics:              metrics,
 		volumeSnapshotLister: volumeSnapshotLister,
 		volumeSnapshotClient: volumeSnapshotClient,
+		resourceTimeout:      resourceTimeout,
 	}
 }
 
@@ -241,7 +245,7 @@ func (r *backupFinalizerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 
 		// Delete the VolumeSnapshots created in the backup, when CSI feature is enabled.
 		if len(volumeSnapshots) > 0 && len(volumeSnapshotContents) > 0 {
-			deleteVolumeSnapshots(volumeSnapshots, volumeSnapshotContents, log, 30, r.client, r.volumeSnapshotClient, 10)
+			deleteVolumeSnapshots(volumeSnapshots, volumeSnapshotContents, log, 30, r.client, r.volumeSnapshotClient, r.resourceTimeout)
 		}
 	}
 

diff --git a/pkg/controller/backup_finalizer_controller_test.go b/pkg/controller/backup_finalizer_controller_test.go
@@ -64,6 +64,7 @@ func mockBackupFinalizerReconciler(fakectx context.Context, fakeClient kbclient.
 		metrics.NewServerMetrics(),
 		fakevolumeSnapshotLister,
 		fakevolumeSnapshotClient,
+		10*time.Minute,
 	), backupper
 }
 func TestBackupFinalizerReconcile(t *testing.T) {