mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-07-31 04:22:44 +00:00
chore: replace vmware-tanzu/velero org references
Agent-Logs-Url: https://github.com/velero-io/velero/sessions/e8c22e84-a488-4645-a0e1-aea5a2926503 Co-authored-by: kaovilai <11228024+kaovilai@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
co-authored by
kaovilai
kaovilai
parent
d987388698
commit
0b7eaaf4e6
@@ -42,27 +42,27 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/event"
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/credentials"
|
||||
"github.com/vmware-tanzu/velero/internal/resourcepolicies"
|
||||
"github.com/vmware-tanzu/velero/internal/storage"
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
pkgbackup "github.com/vmware-tanzu/velero/pkg/backup"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/discovery"
|
||||
"github.com/vmware-tanzu/velero/pkg/features"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/persistence"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
"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/encode"
|
||||
kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/logging"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/results"
|
||||
veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero"
|
||||
"github.com/velero-io/velero/internal/credentials"
|
||||
"github.com/velero-io/velero/internal/resourcepolicies"
|
||||
"github.com/velero-io/velero/internal/storage"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
pkgbackup "github.com/velero-io/velero/pkg/backup"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/discovery"
|
||||
"github.com/velero-io/velero/pkg/features"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/collections"
|
||||
"github.com/velero-io/velero/pkg/util/encode"
|
||||
kubeutil "github.com/velero-io/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/pkg/util/logging"
|
||||
"github.com/velero-io/velero/pkg/util/results"
|
||||
veleroutil "github.com/velero-io/velero/pkg/util/velero"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -766,7 +766,7 @@ func (b *backupReconciler) runBackup(backup *pkgbackup.Request) error {
|
||||
}
|
||||
|
||||
// native snapshots phase will either be failed or completed right away
|
||||
// https://github.com/vmware-tanzu/velero/blob/de3ea52f0cc478e99efa7b9524c7f353514261a4/pkg/backup/item_backupper.go#L632-L639
|
||||
// https://github.com/velero-io/velero/blob/de3ea52f0cc478e99efa7b9524c7f353514261a4/pkg/backup/item_backupper.go#L632-L639
|
||||
backup.Status.VolumeSnapshotsAttempted = len(backup.VolumeSnapshots.Get())
|
||||
for _, snap := range backup.VolumeSnapshots.Get() {
|
||||
if snap.Status.Phase == volume.SnapshotPhaseCompleted {
|
||||
|
||||
@@ -44,24 +44,24 @@ import (
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
fakeClient "sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
pkgbackup "github.com/vmware-tanzu/velero/pkg/backup"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/discovery"
|
||||
"github.com/vmware-tanzu/velero/pkg/features"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/persistence"
|
||||
persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework"
|
||||
pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks"
|
||||
biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/itemblockaction/v1"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/logging"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
pkgbackup "github.com/velero-io/velero/pkg/backup"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/discovery"
|
||||
"github.com/velero-io/velero/pkg/features"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework"
|
||||
pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks"
|
||||
biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
ibav1 "github.com/velero-io/velero/pkg/plugin/velero/itemblockaction/v1"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
kubeutil "github.com/velero-io/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/pkg/util/logging"
|
||||
)
|
||||
|
||||
type fakeBackupper struct {
|
||||
|
||||
@@ -37,27 +37,27 @@ import (
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/credentials"
|
||||
"github.com/vmware-tanzu/velero/internal/delete"
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/discovery"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/persistence"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/podvolume"
|
||||
"github.com/vmware-tanzu/velero/pkg/repository"
|
||||
repomanager "github.com/vmware-tanzu/velero/pkg/repository/manager"
|
||||
repotypes "github.com/vmware-tanzu/velero/pkg/repository/types"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/csi"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/filesystem"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero"
|
||||
"github.com/velero-io/velero/internal/credentials"
|
||||
"github.com/velero-io/velero/internal/delete"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/discovery"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
"github.com/velero-io/velero/pkg/podvolume"
|
||||
"github.com/velero-io/velero/pkg/repository"
|
||||
repomanager "github.com/velero-io/velero/pkg/repository/manager"
|
||||
repotypes "github.com/velero-io/velero/pkg/repository/types"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/csi"
|
||||
"github.com/velero-io/velero/pkg/util/filesystem"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
veleroutil "github.com/velero-io/velero/pkg/util/velero"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -44,21 +44,21 @@ import (
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
pkgbackup "github.com/vmware-tanzu/velero/pkg/backup"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/repository"
|
||||
repomanager "github.com/vmware-tanzu/velero/pkg/repository/manager"
|
||||
repomocks "github.com/vmware-tanzu/velero/pkg/repository/mocks"
|
||||
repotypes "github.com/vmware-tanzu/velero/pkg/repository/types"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
pkgbackup "github.com/velero-io/velero/pkg/backup"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero/mocks"
|
||||
"github.com/velero-io/velero/pkg/repository"
|
||||
repomanager "github.com/velero-io/velero/pkg/repository/manager"
|
||||
repomocks "github.com/velero-io/velero/pkg/repository/mocks"
|
||||
repotypes "github.com/velero-io/velero/pkg/repository/types"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
type backupDeletionControllerTestData struct {
|
||||
@@ -292,7 +292,7 @@ func TestBackupDeletionControllerReconcile(t *testing.T) {
|
||||
|
||||
// Clear out resource labels to make sure the controller adds them and does not
|
||||
// panic when encountering a nil Labels map
|
||||
// (https://github.com/vmware-tanzu/velero/issues/1546)
|
||||
// (https://github.com/velero-io/velero/issues/1546)
|
||||
input.Labels = nil
|
||||
|
||||
backup := builder.ForBackup(velerov1api.DefaultNamespace, "foo").Result()
|
||||
@@ -527,7 +527,7 @@ func TestBackupDeletionControllerReconcile(t *testing.T) {
|
||||
input := defaultTestDbr()
|
||||
// Clear out resource labels to make sure the controller adds them and does not
|
||||
// panic when encountering a nil Labels map
|
||||
// (https://github.com/vmware-tanzu/velero/issues/1546)
|
||||
// (https://github.com/velero-io/velero/issues/1546)
|
||||
input.Labels = nil
|
||||
|
||||
location := &velerov1api.BackupStorageLocation{
|
||||
@@ -612,7 +612,7 @@ func TestBackupDeletionControllerReconcile(t *testing.T) {
|
||||
input := defaultTestDbr()
|
||||
// Clear out resource labels to make sure the controller adds them and does not
|
||||
// panic when encountering a nil Labels map
|
||||
// (https://github.com/vmware-tanzu/velero/issues/1546)
|
||||
// (https://github.com/velero-io/velero/issues/1546)
|
||||
input.Labels = nil
|
||||
|
||||
location := &velerov1api.BackupStorageLocation{
|
||||
|
||||
@@ -30,17 +30,17 @@ import (
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
pkgbackup "github.com/vmware-tanzu/velero/pkg/backup"
|
||||
"github.com/vmware-tanzu/velero/pkg/client"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/persistence"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/encode"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
pkgbackup "github.com/velero-io/velero/pkg/backup"
|
||||
"github.com/velero-io/velero/pkg/client"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework"
|
||||
"github.com/velero-io/velero/pkg/util/encode"
|
||||
)
|
||||
|
||||
// backupFinalizerReconciler reconciles a Backup object
|
||||
|
||||
@@ -33,16 +33,16 @@ import (
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/features"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/features"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func mockBackupFinalizerReconciler(fakeClient kbclient.Client, fakeGlobalClient kbclient.Client, fakeClock *testclocks.FakeClock) (*backupFinalizerReconciler, *fakeBackupper) {
|
||||
|
||||
@@ -22,7 +22,7 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
v2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
v2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
@@ -34,15 +34,15 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperationmap"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/persistence"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/encode"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/itemoperationmap"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/velero-io/velero/pkg/util/encode"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -229,7 +229,7 @@ func (c *backupOperationsReconciler) updateBackupAndOperationsJSON(
|
||||
|
||||
if len(operations.ErrsSinceUpdate) > 0 {
|
||||
c.metrics.RegisterBackupItemsErrorsGauge(backupScheduleName, backup.Status.Errors)
|
||||
// FIXME: download/upload results once https://github.com/vmware-tanzu/velero/pull/5576 is merged
|
||||
// FIXME: download/upload results once https://github.com/velero-io/velero/pull/5576 is merged
|
||||
}
|
||||
removeIfComplete := true
|
||||
defer func() {
|
||||
|
||||
@@ -20,7 +20,7 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
v2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
v2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
"github.com/stretchr/testify/assert"
|
||||
@@ -33,18 +33,18 @@ import (
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperationmap"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
biav2mocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/backupitemaction/v2"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/itemoperationmap"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
biav2mocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/backupitemaction/v2"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -35,10 +35,10 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/collections"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/util/collections"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
// backupQueueReconciler reconciles a Backup object
|
||||
|
||||
@@ -30,9 +30,9 @@ import (
|
||||
|
||||
//"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestBackupQueueReconciler(t *testing.T) {
|
||||
|
||||
@@ -39,14 +39,14 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/repository/maintenance"
|
||||
repomanager "github.com/vmware-tanzu/velero/pkg/repository/manager"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/logging"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/repository/maintenance"
|
||||
repomanager "github.com/velero-io/velero/pkg/repository/manager"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/pkg/util/logging"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -32,17 +32,17 @@ import (
|
||||
"k8s.io/utils/clock"
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/repository"
|
||||
"github.com/vmware-tanzu/velero/pkg/repository/maintenance"
|
||||
repomaintenance "github.com/vmware-tanzu/velero/pkg/repository/maintenance"
|
||||
repomanager "github.com/vmware-tanzu/velero/pkg/repository/manager"
|
||||
repomokes "github.com/vmware-tanzu/velero/pkg/repository/mocks"
|
||||
repotypes "github.com/vmware-tanzu/velero/pkg/repository/types"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/logging"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/repository"
|
||||
"github.com/velero-io/velero/pkg/repository/maintenance"
|
||||
repomaintenance "github.com/velero-io/velero/pkg/repository/maintenance"
|
||||
repomanager "github.com/velero-io/velero/pkg/repository/manager"
|
||||
repomokes "github.com/velero-io/velero/pkg/repository/mocks"
|
||||
repotypes "github.com/velero-io/velero/pkg/repository/types"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/util/logging"
|
||||
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||
|
||||
@@ -22,7 +22,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
@@ -32,12 +32,12 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/storage"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/persistence"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/internal/storage"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -20,7 +20,7 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
@@ -35,13 +35,13 @@ import (
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
"k8s.io/client-go/kubernetes/scheme"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/storage"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/internal/storage"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
var _ = Describe("Backup Storage Location Reconciler", func() {
|
||||
|
||||
@@ -33,13 +33,13 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/builder"
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/persistence"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
veleroutil "github.com/velero-io/velero/pkg/util/velero"
|
||||
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
@@ -37,13 +37,13 @@ import (
|
||||
ctrlClient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func defaultLocation(namespace string) *velerov1api.BackupStorageLocation {
|
||||
|
||||
@@ -40,20 +40,20 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/apis/velero/shared"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
datamover "github.com/vmware-tanzu/velero/pkg/datamover"
|
||||
"github.com/vmware-tanzu/velero/pkg/datapath"
|
||||
"github.com/vmware-tanzu/velero/pkg/exposer"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/nodeagent"
|
||||
repository "github.com/vmware-tanzu/velero/pkg/repository/manager"
|
||||
velerotypes "github.com/vmware-tanzu/velero/pkg/types"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
"github.com/vmware-tanzu/velero/pkg/util"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/pkg/apis/velero/shared"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
datamover "github.com/velero-io/velero/pkg/datamover"
|
||||
"github.com/velero-io/velero/pkg/datapath"
|
||||
"github.com/velero-io/velero/pkg/exposer"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/nodeagent"
|
||||
repository "github.com/velero-io/velero/pkg/repository/manager"
|
||||
velerotypes "github.com/velero-io/velero/pkg/types"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
"github.com/velero-io/velero/pkg/util"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
// DataDownloadReconciler reconciles a DataDownload object
|
||||
|
||||
@@ -40,18 +40,18 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/manager"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/datapath"
|
||||
datapathmockes "github.com/vmware-tanzu/velero/pkg/datapath/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/exposer"
|
||||
exposermockes "github.com/vmware-tanzu/velero/pkg/exposer/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerotypes "github.com/vmware-tanzu/velero/pkg/types"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/datapath"
|
||||
datapathmockes "github.com/velero-io/velero/pkg/datapath/mocks"
|
||||
"github.com/velero-io/velero/pkg/exposer"
|
||||
exposermockes "github.com/velero-io/velero/pkg/exposer/mocks"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
velerotypes "github.com/velero-io/velero/pkg/types"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
const dataDownloadName string = "datadownload-1"
|
||||
|
||||
@@ -41,19 +41,19 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/apis/velero/shared"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/datamover"
|
||||
"github.com/vmware-tanzu/velero/pkg/datapath"
|
||||
"github.com/vmware-tanzu/velero/pkg/exposer"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/nodeagent"
|
||||
velerotypes "github.com/vmware-tanzu/velero/pkg/types"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
"github.com/vmware-tanzu/velero/pkg/util"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/pkg/apis/velero/shared"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/datamover"
|
||||
"github.com/velero-io/velero/pkg/datapath"
|
||||
"github.com/velero-io/velero/pkg/exposer"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/nodeagent"
|
||||
velerotypes "github.com/velero-io/velero/pkg/types"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
"github.com/velero-io/velero/pkg/util"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -46,18 +46,18 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/manager"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/datapath"
|
||||
datapathmocks "github.com/vmware-tanzu/velero/pkg/datapath/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/exposer"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerotypes "github.com/vmware-tanzu/velero/pkg/types"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/datapath"
|
||||
datapathmocks "github.com/velero-io/velero/pkg/datapath/mocks"
|
||||
"github.com/velero-io/velero/pkg/exposer"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
velerotypes "github.com/velero-io/velero/pkg/types"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
const dataUploadName = "dataupload-1"
|
||||
|
||||
@@ -29,12 +29,12 @@ import (
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperationmap"
|
||||
"github.com/vmware-tanzu/velero/pkg/persistence"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/itemoperationmap"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -32,12 +32,12 @@ import (
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
var _ = Describe("Download Request Reconciler", func() {
|
||||
|
||||
@@ -31,13 +31,13 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/event"
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
pkgbackup "github.com/vmware-tanzu/velero/pkg/backup"
|
||||
veleroclient "github.com/vmware-tanzu/velero/pkg/client"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
pkgbackup "github.com/velero-io/velero/pkg/backup"
|
||||
veleroclient "github.com/velero-io/velero/pkg/client"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
veleroutil "github.com/velero-io/velero/pkg/util/velero"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -28,9 +28,9 @@ import (
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func mockGCReconciler(fakeClient kbclient.Client, fakeClock *testclocks.FakeClock, freq time.Duration) *gcReconciler {
|
||||
|
||||
@@ -40,16 +40,16 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
veleroapishared "github.com/vmware-tanzu/velero/pkg/apis/velero/shared"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/datapath"
|
||||
"github.com/vmware-tanzu/velero/pkg/exposer"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/nodeagent"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
"github.com/vmware-tanzu/velero/pkg/util"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
veleroapishared "github.com/velero-io/velero/pkg/apis/velero/shared"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/datapath"
|
||||
"github.com/velero-io/velero/pkg/exposer"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/nodeagent"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
"github.com/velero-io/velero/pkg/util"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -43,16 +43,16 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/manager"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/datapath"
|
||||
datapathmocks "github.com/vmware-tanzu/velero/pkg/datapath/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/exposer"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/datapath"
|
||||
datapathmocks "github.com/velero-io/velero/pkg/datapath/mocks"
|
||||
"github.com/velero-io/velero/pkg/exposer"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
const pvbName = "pvb-1"
|
||||
|
||||
@@ -42,18 +42,18 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
veleroapishared "github.com/vmware-tanzu/velero/pkg/apis/velero/shared"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/datapath"
|
||||
"github.com/vmware-tanzu/velero/pkg/exposer"
|
||||
"github.com/vmware-tanzu/velero/pkg/nodeagent"
|
||||
repository "github.com/vmware-tanzu/velero/pkg/repository/manager"
|
||||
"github.com/vmware-tanzu/velero/pkg/restorehelper"
|
||||
velerotypes "github.com/vmware-tanzu/velero/pkg/types"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
"github.com/vmware-tanzu/velero/pkg/util"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
veleroapishared "github.com/velero-io/velero/pkg/apis/velero/shared"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/datapath"
|
||||
"github.com/velero-io/velero/pkg/exposer"
|
||||
"github.com/velero-io/velero/pkg/nodeagent"
|
||||
repository "github.com/velero-io/velero/pkg/repository/manager"
|
||||
"github.com/velero-io/velero/pkg/restorehelper"
|
||||
velerotypes "github.com/velero-io/velero/pkg/types"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
"github.com/velero-io/velero/pkg/util"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
func NewPodVolumeRestoreReconciler(
|
||||
|
||||
@@ -43,18 +43,18 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/manager"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/datapath"
|
||||
datapathmockes "github.com/vmware-tanzu/velero/pkg/datapath/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/exposer"
|
||||
exposermockes "github.com/vmware-tanzu/velero/pkg/exposer/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/restorehelper"
|
||||
"github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/datapath"
|
||||
datapathmockes "github.com/velero-io/velero/pkg/datapath/mocks"
|
||||
"github.com/velero-io/velero/pkg/exposer"
|
||||
exposermockes "github.com/velero-io/velero/pkg/exposer/mocks"
|
||||
"github.com/velero-io/velero/pkg/restorehelper"
|
||||
"github.com/velero-io/velero/pkg/test"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
func TestShouldProcess(t *testing.T) {
|
||||
|
||||
@@ -42,24 +42,24 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/hook"
|
||||
"github.com/vmware-tanzu/velero/internal/resourcemodifiers"
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/persistence"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework"
|
||||
pkgrestore "github.com/vmware-tanzu/velero/pkg/restore"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/collections"
|
||||
kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/logging"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/results"
|
||||
veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero"
|
||||
pkgrestoreUtil "github.com/vmware-tanzu/velero/pkg/util/velero/restore"
|
||||
"github.com/velero-io/velero/internal/hook"
|
||||
"github.com/velero-io/velero/internal/resourcemodifiers"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework"
|
||||
pkgrestore "github.com/velero-io/velero/pkg/restore"
|
||||
"github.com/velero-io/velero/pkg/util/collections"
|
||||
kubeutil "github.com/velero-io/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/pkg/util/logging"
|
||||
"github.com/velero-io/velero/pkg/util/results"
|
||||
veleroutil "github.com/velero-io/velero/pkg/util/velero"
|
||||
pkgrestoreUtil "github.com/velero-io/velero/pkg/util/velero/restore"
|
||||
)
|
||||
|
||||
// nonRestorableResources is an exclusion list for the restoration process. Any resources
|
||||
@@ -70,22 +70,22 @@ var nonRestorableResources = []string{
|
||||
"events.events.k8s.io",
|
||||
|
||||
// Don't ever restore backups - if appropriate, they'll be synced in from object storage.
|
||||
// https://github.com/vmware-tanzu/velero/issues/622
|
||||
// https://github.com/velero-io/velero/issues/622
|
||||
"backups.velero.io",
|
||||
|
||||
// Restores are cluster-specific, and don't have value moving across clusters.
|
||||
// https://github.com/vmware-tanzu/velero/issues/622
|
||||
// https://github.com/velero-io/velero/issues/622
|
||||
"restores.velero.io",
|
||||
|
||||
// TODO: Remove this in v1.11 or v1.12
|
||||
// Restic repositories are automatically managed by Velero and will be automatically
|
||||
// created as needed if they don't exist.
|
||||
// https://github.com/vmware-tanzu/velero/issues/1113
|
||||
// https://github.com/velero-io/velero/issues/1113
|
||||
"resticrepositories.velero.io",
|
||||
|
||||
// CSINode delegates cluster node for CSI operation.
|
||||
// VolumeAttachement records PV mounts to which node.
|
||||
// https://github.com/vmware-tanzu/velero/issues/4823
|
||||
// https://github.com/velero-io/velero/issues/4823
|
||||
"csinodes.storage.k8s.io",
|
||||
"volumeattachments.storage.k8s.io",
|
||||
|
||||
|
||||
@@ -35,20 +35,20 @@ import (
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/resourcemodifiers"
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework"
|
||||
pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks"
|
||||
riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2"
|
||||
pkgrestore "github.com/vmware-tanzu/velero/pkg/restore"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/logging"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/results"
|
||||
"github.com/velero-io/velero/internal/resourcemodifiers"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework"
|
||||
pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks"
|
||||
riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2"
|
||||
pkgrestore "github.com/velero-io/velero/pkg/restore"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/util/logging"
|
||||
"github.com/velero-io/velero/pkg/util/results"
|
||||
)
|
||||
|
||||
func TestFetchBackupInfo(t *testing.T) {
|
||||
|
||||
@@ -36,18 +36,18 @@ import (
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/hook"
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"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/util/boolptr"
|
||||
kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/results"
|
||||
"github.com/velero-io/velero/internal/hook"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
kubeutil "github.com/velero-io/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/pkg/util/results"
|
||||
)
|
||||
|
||||
type restoreFinalizerReconciler struct {
|
||||
|
||||
@@ -36,20 +36,20 @@ import (
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
crclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/hook"
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
pkgUtilKubeMocks "github.com/vmware-tanzu/velero/pkg/util/kube/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/results"
|
||||
"github.com/velero-io/velero/internal/hook"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
pkgUtilKubeMocks "github.com/velero-io/velero/pkg/util/kube/mocks"
|
||||
"github.com/velero-io/velero/pkg/util/results"
|
||||
)
|
||||
|
||||
func TestRestoreFinalizerReconcile(t *testing.T) {
|
||||
|
||||
@@ -30,14 +30,14 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperationmap"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/persistence"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/itemoperationmap"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -31,18 +31,18 @@ import (
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperationmap"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/vmware-tanzu/velero/pkg/plugin/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
riav2mocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/restoreitemaction/v2"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/itemoperationmap"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/clientmgmt"
|
||||
pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
riav2mocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/restoreitemaction/v2"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -33,11 +33,11 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||
|
||||
velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -31,10 +31,10 @@ import (
|
||||
ctrl "sigs.k8s.io/controller-runtime"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||
|
||||
velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/metrics"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerov1 "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/metrics"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
// Test reconcile function of schedule controller. Pause is not covered as event filter will not allow it through
|
||||
@@ -334,7 +334,7 @@ func TestGetNextRunTime(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestParseCronSchedule(t *testing.T) {
|
||||
// From https://github.com/vmware-tanzu/velero/issues/30, where we originally were using cron.Parse(),
|
||||
// From https://github.com/velero-io/velero/issues/30, where we originally were using cron.Parse(),
|
||||
// which treats the first field as seconds, and not minutes. We want to use cron.ParseStandard()
|
||||
// instead, which has the first field as minutes.
|
||||
|
||||
|
||||
@@ -29,12 +29,12 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/controller"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/velero"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/buildinfo"
|
||||
"github.com/vmware-tanzu/velero/pkg/constant"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
|
||||
"github.com/velero-io/velero/internal/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/buildinfo"
|
||||
"github.com/velero-io/velero/pkg/constant"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework/common"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -30,12 +30,12 @@ import (
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/buildinfo"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/buildinfo"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework/common"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func statusRequestBuilder(resourceVersion string) *builder.ServerStatusRequestBuilder {
|
||||
|
||||
@@ -25,8 +25,8 @@ import (
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/persistence"
|
||||
persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks"
|
||||
|
||||
"k8s.io/klog/v2"
|
||||
"sigs.k8s.io/controller-runtime/pkg/envtest"
|
||||
@@ -35,8 +35,8 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1api "github.com/velero-io/velero/pkg/apis/velero/v2alpha1"
|
||||
|
||||
"k8s.io/client-go/kubernetes/scheme"
|
||||
"k8s.io/client-go/rest"
|
||||
|
||||
Reference in New Issue
Block a user