Merge branch 'main' of https://github.com/qiuming-best/velero into uploader-kopia

pkg/controller/backup_deletion_controller.go

@@ -40,6 +40,7 @@ import (
 	"github.com/vmware-tanzu/velero/pkg/persistence"
 	"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
 	"github.com/vmware-tanzu/velero/pkg/plugin/velero"
+	"github.com/vmware-tanzu/velero/pkg/repository"
 	"github.com/vmware-tanzu/velero/pkg/restic"
 	"github.com/vmware-tanzu/velero/pkg/util/filesystem"
 	"github.com/vmware-tanzu/velero/pkg/util/kube"
@@ -56,7 +57,7 @@ type backupDeletionReconciler struct {
 	client.Client
 	logger            logrus.FieldLogger
 	backupTracker     BackupTracker
-	resticMgr         restic.RepositoryManager
+	repoMgr           repository.Manager
 	metrics           *metrics.ServerMetrics
 	clock             clock.Clock
 	discoveryHelper   discovery.Helper
@@ -69,7 +70,7 @@ func NewBackupDeletionReconciler(
 	logger logrus.FieldLogger,
 	client client.Client,
 	backupTracker BackupTracker,
-	resticMgr restic.RepositoryManager,
+	repoMgr repository.Manager,
 	metrics *metrics.ServerMetrics,
 	helper discovery.Helper,
 	newPluginManager func(logrus.FieldLogger) clientmgmt.Manager,
@@ -79,7 +80,7 @@ func NewBackupDeletionReconciler(
 		Client:            client,
 		logger:            logger,
 		backupTracker:     backupTracker,
-		resticMgr:         resticMgr,
+		repoMgr:           repoMgr,
 		metrics:           metrics,
 		clock:             clock.RealClock{},
 		discoveryHelper:   helper,
@@ -435,7 +436,7 @@ func (r *backupDeletionReconciler) deleteExistingDeletionRequests(ctx context.Co
 }
 
 func (r *backupDeletionReconciler) deleteResticSnapshots(ctx context.Context, backup *velerov1api.Backup) []error {
-	if r.resticMgr == nil {
+	if r.repoMgr == nil {
 		return nil
 	}
 
@@ -449,7 +450,7 @@ func (r *backupDeletionReconciler) deleteResticSnapshots(ctx context.Context, ba
 
 	var errs []error
 	for _, snapshot := range snapshots {
-		if err := r.resticMgr.Forget(ctx2, snapshot); err != nil {
+		if err := r.repoMgr.Forget(ctx2, snapshot); err != nil {
 			errs = append(errs, err)
 		}
 	}

pkg/controller/restic_repository_controller.go

@@ -30,6 +30,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
+	"github.com/vmware-tanzu/velero/pkg/repository"
 	repoconfig "github.com/vmware-tanzu/velero/pkg/repository/config"
 	"github.com/vmware-tanzu/velero/pkg/restic"
 	"github.com/vmware-tanzu/velero/pkg/util/kube"
@@ -45,11 +46,11 @@ type ResticRepoReconciler struct {
 	logger                      logrus.FieldLogger
 	clock                       clock.Clock
 	defaultMaintenanceFrequency time.Duration
-	repositoryManager           restic.RepositoryManager
+	repositoryManager           repository.Manager
 }
 
 func NewResticRepoReconciler(namespace string, logger logrus.FieldLogger, client client.Client,
-	defaultMaintenanceFrequency time.Duration, repositoryManager restic.RepositoryManager) *ResticRepoReconciler {
+	defaultMaintenanceFrequency time.Duration, repositoryManager repository.Manager) *ResticRepoReconciler {
 	c := &ResticRepoReconciler{
 		client,
 		namespace,
@@ -163,7 +164,7 @@ func (r *ResticRepoReconciler) initializeRepo(ctx context.Context, req *velerov1
 // ensureRepo checks to see if a repository exists, and attempts to initialize it if
 // it does not exist. An error is returned if the repository can't be connected to
 // or initialized.
-func ensureRepo(repo *velerov1api.BackupRepository, repoManager restic.RepositoryManager) error {
+func ensureRepo(repo *velerov1api.BackupRepository, repoManager repository.Manager) error {
 	if err := repoManager.ConnectToRepo(repo); err != nil {
 		// If the repository has not yet been initialized, the error message will always include
 		// the following string. This is the only scenario where we should try to initialize it.

pkg/controller/restic_repository_controller_test.go

@@ -24,14 +24,14 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
-	resticmokes "github.com/vmware-tanzu/velero/pkg/restic/mocks"
+	repomokes "github.com/vmware-tanzu/velero/pkg/repository/mocks"
 	velerotest "github.com/vmware-tanzu/velero/pkg/test"
 )
 
 const defaultMaintenanceFrequency = 10 * time.Minute
 
 func mockResticRepoReconciler(t *testing.T, rr *velerov1api.BackupRepository, mockOn string, arg interface{}, ret interface{}) *ResticRepoReconciler {
-	mgr := &resticmokes.RepositoryManager{}
+	mgr := &repomokes.RepositoryManager{}
 	if mockOn != "" {
 		mgr.On(mockOn, arg).Return(ret)
 	}