mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-09-26 09:54:23 +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:
co-authored by
kaovilai
parent
d987388698
commit
0b7eaaf4e6
@@ -31,12 +31,12 @@ import (
|
||||
cachetool "k8s.io/client-go/tools/cache"
|
||||
"sigs.k8s.io/controller-runtime/pkg/cache"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/credentials"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/datapath"
|
||||
"github.com/vmware-tanzu/velero/pkg/repository"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/internal/credentials"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/datapath"
|
||||
"github.com/velero-io/velero/pkg/repository"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
)
|
||||
|
||||
@@ -30,19 +30,19 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/datapath"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/datapath"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
|
||||
clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
datapathmockes "github.com/vmware-tanzu/velero/pkg/datapath/mocks"
|
||||
datapathmockes "github.com/velero-io/velero/pkg/datapath/mocks"
|
||||
)
|
||||
|
||||
type backupMsTestHelper struct {
|
||||
|
||||
+13
-13
@@ -30,17 +30,17 @@ import (
|
||||
ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache"
|
||||
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/resourcepolicies"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
veleroclient "github.com/vmware-tanzu/velero/pkg/client"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/nodeagent"
|
||||
"github.com/vmware-tanzu/velero/pkg/podvolume/configs"
|
||||
"github.com/vmware-tanzu/velero/pkg/repository"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
uploaderutil "github.com/vmware-tanzu/velero/pkg/uploader/util"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/internal/resourcepolicies"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
veleroclient "github.com/velero-io/velero/pkg/client"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
"github.com/velero-io/velero/pkg/nodeagent"
|
||||
"github.com/velero-io/velero/pkg/podvolume/configs"
|
||||
"github.com/velero-io/velero/pkg/repository"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
uploaderutil "github.com/velero-io/velero/pkg/uploader/util"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -371,7 +371,7 @@ func (b *backupper) BackupPodVolumes(backup *velerov1api.Backup, pod *corev1api.
|
||||
continue
|
||||
}
|
||||
// similar with above: the PVB may be handled very quickly by the controller and the informer handler will call "b.wg.Done()" before "b.wg.Add(1)" runs which causes panic
|
||||
// see https://github.com/vmware-tanzu/velero/issues/8657
|
||||
// see https://github.com/velero-io/velero/issues/8657
|
||||
b.wg.Add(1)
|
||||
if err := veleroclient.CreateRetryGenerateName(b.crClient, b.ctx, volumeBackup); err != nil {
|
||||
b.wg.Done()
|
||||
@@ -397,7 +397,7 @@ func (b *backupper) WaitAllPodVolumesProcessed(log logrus.FieldLogger) []*velero
|
||||
|
||||
var podVolumeBackups []*velerov1api.PodVolumeBackup
|
||||
// if no pod volume backups are tracked, return directly to avoid issue mentioned in
|
||||
// https://github.com/vmware-tanzu/velero/issues/8723
|
||||
// https://github.com/velero-io/velero/issues/8723
|
||||
if len(b.pvbIndexer.List()) == 0 {
|
||||
return podVolumeBackups
|
||||
}
|
||||
|
||||
@@ -25,8 +25,8 @@ import (
|
||||
ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache"
|
||||
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/repository"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/repository"
|
||||
)
|
||||
|
||||
// BackupperFactory can construct pod volumes backuppers.
|
||||
|
||||
@@ -36,11 +36,11 @@ import (
|
||||
clientTesting "k8s.io/client-go/testing"
|
||||
"k8s.io/client-go/tools/cache"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/resourcepolicies"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/repository"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/internal/resourcepolicies"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/repository"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
type fakeInformerRegistration struct{}
|
||||
|
||||
@@ -4,9 +4,9 @@ package mocks
|
||||
|
||||
import (
|
||||
mock "github.com/stretchr/testify/mock"
|
||||
podvolume "github.com/vmware-tanzu/velero/pkg/podvolume"
|
||||
podvolume "github.com/velero-io/velero/pkg/podvolume"
|
||||
|
||||
volume "github.com/vmware-tanzu/velero/internal/volume"
|
||||
volume "github.com/velero-io/velero/internal/volume"
|
||||
)
|
||||
|
||||
// Restorer is an autogenerated mock type for the Restorer type
|
||||
|
||||
@@ -32,12 +32,12 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/cache"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/credentials"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/datapath"
|
||||
"github.com/vmware-tanzu/velero/pkg/repository"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/internal/credentials"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/datapath"
|
||||
"github.com/velero-io/velero/pkg/repository"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
|
||||
cachetool "k8s.io/client-go/tools/cache"
|
||||
)
|
||||
|
||||
@@ -31,19 +31,19 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/datapath"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/datapath"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
|
||||
clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
datapathmockes "github.com/vmware-tanzu/velero/pkg/datapath/mocks"
|
||||
datapathmockes "github.com/velero-io/velero/pkg/datapath/mocks"
|
||||
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
)
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
@@ -33,14 +33,14 @@ import (
|
||||
ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache"
|
||||
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
veleroclient "github.com/vmware-tanzu/velero/pkg/client"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/nodeagent"
|
||||
"github.com/vmware-tanzu/velero/pkg/repository"
|
||||
uploaderutil "github.com/vmware-tanzu/velero/pkg/uploader/util"
|
||||
"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"
|
||||
veleroclient "github.com/velero-io/velero/pkg/client"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
"github.com/velero-io/velero/pkg/nodeagent"
|
||||
"github.com/velero-io/velero/pkg/repository"
|
||||
uploaderutil "github.com/velero-io/velero/pkg/uploader/util"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
type RestoreData struct {
|
||||
|
||||
@@ -26,8 +26,8 @@ import (
|
||||
ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache"
|
||||
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/repository"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/repository"
|
||||
)
|
||||
|
||||
// RestorerFactory can construct pod volumes restorers.
|
||||
|
||||
@@ -33,11 +33,11 @@ import (
|
||||
kubefake "k8s.io/client-go/kubernetes/fake"
|
||||
"k8s.io/client-go/tools/cache"
|
||||
|
||||
"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/repository"
|
||||
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"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/repository"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestGetVolumesRepositoryType(t *testing.T) {
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
)
|
||||
|
||||
func TestOptoutVolume(t *testing.T) {
|
||||
|
||||
@@ -23,10 +23,10 @@ import (
|
||||
corev1api "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/podvolume/configs"
|
||||
repotypes "github.com/vmware-tanzu/velero/pkg/repository/types"
|
||||
"github.com/vmware-tanzu/velero/pkg/uploader"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/podvolume/configs"
|
||||
repotypes "github.com/velero-io/velero/pkg/repository/types"
|
||||
"github.com/velero-io/velero/pkg/uploader"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -87,8 +87,8 @@ func getVolumeBackupInfoForPod(podVolumeBackups []*velerov1api.PodVolumeBackup,
|
||||
}
|
||||
|
||||
// If the volume came from a projected or DownwardAPI source, skip its restore.
|
||||
// This allows backups affected by https://github.com/vmware-tanzu/velero/issues/3863
|
||||
// or https://github.com/vmware-tanzu/velero/issues/4053 to be restored successfully.
|
||||
// This allows backups affected by https://github.com/velero-io/velero/issues/3863
|
||||
// or https://github.com/velero-io/velero/issues/4053 to be restored successfully.
|
||||
if volumeHasNonRestorableSource(pvb.Spec.Volume, pod.Spec.Volumes) {
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -22,8 +22,8 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
corev1api "k8s.io/api/core/v1"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
)
|
||||
|
||||
func TestGetVolumeBackupsForPod(t *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user