mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-09-19 14:34:17 +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
@@ -25,9 +25,9 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/actionhelpers"
|
||||
v1 "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/util/actionhelpers"
|
||||
)
|
||||
|
||||
// PVCAction inspects a PersistentVolumeClaim for the PersistentVolume
|
||||
|
||||
@@ -26,11 +26,11 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
v1 "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestBackupPVAction(t *testing.T) {
|
||||
|
||||
@@ -44,21 +44,21 @@ import (
|
||||
|
||||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1"
|
||||
veleroclient "github.com/vmware-tanzu/velero/pkg/client"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
plugincommon "github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/utils/volumehelper"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
uploaderUtil "github.com/vmware-tanzu/velero/pkg/uploader/util"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/csi"
|
||||
kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
podvolumeutil "github.com/vmware-tanzu/velero/pkg/util/podvolume"
|
||||
vhutil "github.com/vmware-tanzu/velero/pkg/util/volumehelper"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
velerov2alpha1 "github.com/velero-io/velero/pkg/apis/velero/v2alpha1"
|
||||
veleroclient "github.com/velero-io/velero/pkg/client"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
plugincommon "github.com/velero-io/velero/pkg/plugin/framework/common"
|
||||
"github.com/velero-io/velero/pkg/plugin/utils/volumehelper"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
uploaderUtil "github.com/velero-io/velero/pkg/uploader/util"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/csi"
|
||||
kubeutil "github.com/velero-io/velero/pkg/util/kube"
|
||||
podvolumeutil "github.com/velero-io/velero/pkg/util/podvolume"
|
||||
vhutil "github.com/velero-io/velero/pkg/util/volumehelper"
|
||||
)
|
||||
|
||||
// TODO: Replace hardcoded VolumeSnapshot finalizer strings with constants from
|
||||
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
|
||||
volumegroupsnapshotv1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2"
|
||||
"github.com/stretchr/testify/assert"
|
||||
@@ -31,7 +31,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
"k8s.io/utils/pointer"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
|
||||
"github.com/google/go-cmp/cmp"
|
||||
"github.com/google/go-cmp/cmp/cmpopts"
|
||||
@@ -50,13 +50,13 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
crclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/apis/velero/shared"
|
||||
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/builder"
|
||||
factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/apis/velero/shared"
|
||||
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/builder"
|
||||
factorymocks "github.com/velero-io/velero/pkg/client/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
const testDriver = "csi.example.com"
|
||||
|
||||
@@ -30,16 +30,16 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
crclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/client"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
plugincommon "github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/csi"
|
||||
kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/client"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
plugincommon "github.com/velero-io/velero/pkg/plugin/framework/common"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/csi"
|
||||
kubeutil "github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
// volumeSnapshotBackupItemAction is a backup item action plugin to backup
|
||||
|
||||
@@ -28,12 +28,12 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"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"
|
||||
factorymocks "github.com/velero-io/velero/pkg/client/mocks"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestVSExecute(t *testing.T) {
|
||||
|
||||
@@ -24,11 +24,11 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
csiutil "github.com/vmware-tanzu/velero/pkg/util/csi"
|
||||
kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
csiutil "github.com/velero-io/velero/pkg/util/csi"
|
||||
kubeutil "github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
// volumeSnapshotClassBackupItemAction is a backup item action plugin to
|
||||
|
||||
@@ -25,10 +25,10 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
func TestVSClassExecute(t *testing.T) {
|
||||
|
||||
@@ -25,11 +25,11 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
csiutil "github.com/vmware-tanzu/velero/pkg/util/csi"
|
||||
kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
csiutil "github.com/velero-io/velero/pkg/util/csi"
|
||||
kubeutil "github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
// volumeSnapshotContentBackupItemAction is a backup item action plugin to backup
|
||||
|
||||
@@ -25,11 +25,11 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"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/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestVSCExecute(t *testing.T) {
|
||||
|
||||
@@ -22,9 +22,9 @@ import (
|
||||
corev1api "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/actionhelpers"
|
||||
v1 "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/util/actionhelpers"
|
||||
)
|
||||
|
||||
// PodAction implements ItemAction.
|
||||
|
||||
@@ -23,9 +23,9 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestPodActionAppliesTo(t *testing.T) {
|
||||
|
||||
@@ -30,10 +30,10 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery"
|
||||
velerodiscovery "github.com/velero-io/velero/pkg/discovery"
|
||||
|
||||
v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
v1 "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
// RemapCRDVersionAction inspects CustomResourceDefinition and decides if it is a v1
|
||||
|
||||
@@ -31,11 +31,11 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery"
|
||||
velerodiscovery "github.com/velero-io/velero/pkg/discovery"
|
||||
|
||||
v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
v1 "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 TestRemapCRDVersionAction(t *testing.T) {
|
||||
|
||||
@@ -22,10 +22,10 @@ import (
|
||||
"k8s.io/apimachinery/pkg/api/meta"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
velerodiscovery "github.com/vmware-tanzu/velero/pkg/discovery"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/actionhelpers"
|
||||
v1 "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
velerodiscovery "github.com/velero-io/velero/pkg/discovery"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/util/actionhelpers"
|
||||
)
|
||||
|
||||
// ServiceAccountAction implements ItemAction.
|
||||
|
||||
@@ -28,10 +28,10 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/actionhelpers"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/util/actionhelpers"
|
||||
)
|
||||
|
||||
func newV1ClusterRoleBindingList(rbacCRBList []rbacv1.ClusterRoleBinding) []actionhelpers.ClusterRoleBinding {
|
||||
|
||||
+23
-23
@@ -42,28 +42,28 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/hook"
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
"github.com/vmware-tanzu/velero/internal/volumehelper"
|
||||
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/client"
|
||||
"github.com/vmware-tanzu/velero/pkg/discovery"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemblock"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"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/plugin/velero"
|
||||
biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/itemblockaction/v1"
|
||||
vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/podexec"
|
||||
"github.com/vmware-tanzu/velero/pkg/podvolume"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/collections"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/internal/hook"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
"github.com/velero-io/velero/internal/volumehelper"
|
||||
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/client"
|
||||
"github.com/velero-io/velero/pkg/discovery"
|
||||
"github.com/velero-io/velero/pkg/itemblock"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"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/plugin/velero"
|
||||
biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
ibav1 "github.com/velero-io/velero/pkg/plugin/velero/itemblockaction/v1"
|
||||
vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
"github.com/velero-io/velero/pkg/podexec"
|
||||
"github.com/velero-io/velero/pkg/podvolume"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/collections"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
// BackupVersion is the current backup major version for Velero.
|
||||
@@ -327,7 +327,7 @@ func (kb *kubernetesBackupper) BackupWithResolvers(
|
||||
// check if there are any namespaces included in the backup which are managed by argoCD
|
||||
// We will check for the existence of a ArgoCD label in the includedNamespaces and add a warning
|
||||
// so that users are at least aware about the existence of argoCD managed ns in their backup
|
||||
// Related Issue: https://github.com/vmware-tanzu/velero/issues/7905
|
||||
// Related Issue: https://github.com/velero-io/velero/issues/7905
|
||||
if len(nsManagedByArgoCD) > 0 {
|
||||
log.Warnf("backup operation may encounter complications and potentially produce undesirable results due to the inclusion of namespaces %v managed by ArgoCD in the backup.", nsManagedByArgoCD)
|
||||
}
|
||||
|
||||
+21
-21
@@ -41,26 +41,26 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/resourcepolicies"
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
"github.com/vmware-tanzu/velero/pkg/apis/velero/shared"
|
||||
velerov1 "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/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/client"
|
||||
"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/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/persistence"
|
||||
persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
biav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
ibav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/itemblockaction/v1"
|
||||
vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/podvolume"
|
||||
"github.com/vmware-tanzu/velero/pkg/test"
|
||||
kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/internal/resourcepolicies"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
"github.com/velero-io/velero/pkg/apis/velero/shared"
|
||||
velerov1 "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/builder"
|
||||
"github.com/velero-io/velero/pkg/client"
|
||||
"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/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/persistence"
|
||||
persistencemocks "github.com/velero-io/velero/pkg/persistence/mocks"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
biav2 "github.com/velero-io/velero/pkg/plugin/velero/backupitemaction/v2"
|
||||
ibav1 "github.com/velero-io/velero/pkg/plugin/velero/itemblockaction/v1"
|
||||
vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
"github.com/velero-io/velero/pkg/podvolume"
|
||||
"github.com/velero-io/velero/pkg/test"
|
||||
kubeutil "github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
func TestBackedUpItemsMatchesTarballContents(t *testing.T) {
|
||||
@@ -1180,7 +1180,7 @@ func TestBackupResourceCohabitation(t *testing.T) {
|
||||
// TestBackupUsesNewCohabitatingResourcesForEachBackup ensures that when two backups are
|
||||
// run that each include cohabiting resources, one copy of the relevant resources is
|
||||
// backed up in each backup. Verification is done by looking at the contents of the backup
|
||||
// tarball. This covers a specific issue that was fixed by https://github.com/vmware-tanzu/velero/pull/485.
|
||||
// tarball. This covers a specific issue that was fixed by https://github.com/velero-io/velero/pull/485.
|
||||
func TestBackupUsesNewCohabitatingResourcesForEachBackup(t *testing.T) {
|
||||
h := newHarness(t, nil)
|
||||
defer h.itemBlockPool.Stop()
|
||||
|
||||
@@ -21,8 +21,8 @@ import (
|
||||
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
)
|
||||
|
||||
// NewDeleteBackupRequest creates a DeleteBackupRequest for the backup identified by name and uid.
|
||||
|
||||
@@ -37,23 +37,23 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/sets"
|
||||
kbClient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/hook"
|
||||
"github.com/vmware-tanzu/velero/internal/resourcepolicies"
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/archive"
|
||||
"github.com/vmware-tanzu/velero/pkg/client"
|
||||
"github.com/vmware-tanzu/velero/pkg/discovery"
|
||||
"github.com/vmware-tanzu/velero/pkg/features"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemblock"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/podvolume"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
csiutil "github.com/vmware-tanzu/velero/pkg/util/csi"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/volumehelper"
|
||||
"github.com/velero-io/velero/internal/hook"
|
||||
"github.com/velero-io/velero/internal/resourcepolicies"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/archive"
|
||||
"github.com/velero-io/velero/pkg/client"
|
||||
"github.com/velero-io/velero/pkg/discovery"
|
||||
"github.com/velero-io/velero/pkg/features"
|
||||
"github.com/velero-io/velero/pkg/itemblock"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
"github.com/velero-io/velero/pkg/podvolume"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
csiutil "github.com/velero-io/velero/pkg/util/csi"
|
||||
"github.com/velero-io/velero/pkg/util/volumehelper"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -25,8 +25,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
ctrlfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/resourcepolicies"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/internal/resourcepolicies"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
corev1api "k8s.io/api/core/v1"
|
||||
@@ -34,7 +34,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
)
|
||||
|
||||
func Test_resourceKey(t *testing.T) {
|
||||
|
||||
@@ -35,11 +35,11 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
"k8s.io/client-go/tools/pager"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/client"
|
||||
"github.com/vmware-tanzu/velero/pkg/discovery"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/collections"
|
||||
"github.com/velero-io/velero/pkg/client"
|
||||
"github.com/velero-io/velero/pkg/discovery"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/util/collections"
|
||||
)
|
||||
|
||||
// itemCollector collects items from the Kubernetes API according to
|
||||
@@ -150,7 +150,7 @@ func (nt *nsTracker) init(
|
||||
// Skip the backup when the backup's namespace filter has
|
||||
// default value, and the namespace doesn't match backup
|
||||
// LabelSelector and OrLabelSelector.
|
||||
// https://github.com/vmware-tanzu/velero/issues/7105
|
||||
// https://github.com/velero-io/velero/issues/7105
|
||||
if nt.namespaceFilter.IncludeEverything() &&
|
||||
(nt.singleLabelSelector != nil || len(nt.orLabelSelector) > 0) {
|
||||
continue
|
||||
|
||||
@@ -28,11 +28,11 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/collections"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/util/collections"
|
||||
)
|
||||
|
||||
func TestSortCoreGroup(t *testing.T) {
|
||||
|
||||
@@ -25,7 +25,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/api/meta"
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/itemblock"
|
||||
"github.com/velero-io/velero/pkg/itemblock"
|
||||
)
|
||||
|
||||
type BackupItemBlock struct {
|
||||
|
||||
@@ -22,13 +22,13 @@ import (
|
||||
"github.com/gobwas/glob"
|
||||
"k8s.io/apimachinery/pkg/labels"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/hook"
|
||||
"github.com/vmware-tanzu/velero/internal/resourcepolicies"
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/collections"
|
||||
"github.com/velero-io/velero/internal/hook"
|
||||
"github.com/velero-io/velero/internal/resourcepolicies"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework"
|
||||
"github.com/velero-io/velero/pkg/util/collections"
|
||||
)
|
||||
|
||||
type itemKey struct {
|
||||
|
||||
@@ -24,10 +24,10 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/sets"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/features"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/features"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
)
|
||||
|
||||
// GetBackupCSIResources is used to get CSI snapshot related resources.
|
||||
|
||||
@@ -3,8 +3,8 @@ package backup
|
||||
import (
|
||||
"sync"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
)
|
||||
|
||||
type VolumeSnapshotterCache struct {
|
||||
|
||||
Reference in New Issue
Block a user