mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-09-20 15:04: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
@@ -22,8 +22,8 @@ import (
|
||||
corev1api "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
type AddPVCFromPodAction struct {
|
||||
|
||||
@@ -26,9 +26,9 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"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 TestAddPVCFromPodActionExecute(t *testing.T) {
|
||||
|
||||
@@ -22,12 +22,12 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
// AdmissionWebhookConfigurationAction is a RestoreItemAction plugin applicable to mutatingwebhookconfiguration and
|
||||
// validatingwebhookconfiguration to reset the invalid value for "sideEffects" of the webhooks.
|
||||
// More background please refer to https://github.com/vmware-tanzu/velero/issues/3516
|
||||
// More background please refer to https://github.com/velero-io/velero/issues/3516
|
||||
type AdmissionWebhookConfigurationAction struct {
|
||||
logger logrus.FieldLogger
|
||||
}
|
||||
|
||||
@@ -25,8 +25,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestNewAdmissionWebhookConfigurationActionExecute(t *testing.T) {
|
||||
|
||||
@@ -20,7 +20,7 @@ import (
|
||||
"github.com/sirupsen/logrus"
|
||||
"k8s.io/kube-aggregator/pkg/controllers/autoregister"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
type APIServiceAction struct {
|
||||
|
||||
@@ -25,8 +25,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestAPIServiceActionExecuteSkipsRestore(t *testing.T) {
|
||||
|
||||
@@ -28,8 +28,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework/common"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -28,8 +28,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/client-go/kubernetes/fake"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
// TestChangeImageRepositoryActionExecute runs the ChangeImageNameAction's Execute
|
||||
|
||||
@@ -29,8 +29,8 @@ import (
|
||||
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
|
||||
storagev1client "k8s.io/client-go/kubernetes/typed/storage/v1"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework/common"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
// ChangeStorageClassAction updates a PV or PVC's storage class name
|
||||
|
||||
@@ -30,8 +30,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/client-go/kubernetes/fake"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
// TestChangeStorageClassActionExecute runs the ChangeStorageClassAction's Execute
|
||||
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
// ClusterRoleBindingAction handle namespace remappings for role bindings
|
||||
|
||||
@@ -26,9 +26,9 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/test"
|
||||
api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestClusterRoleBindingActionAppliesTo(t *testing.T) {
|
||||
|
||||
@@ -25,7 +25,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
// CRDV1PreserveUnknownFieldsAction will take a CRD and inspect it for the API version and the PreserveUnknownFields value.
|
||||
|
||||
@@ -23,13 +23,13 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestExecuteForACRDWithAnIntOnAFloat64FieldShouldWork(t *testing.T) {
|
||||
// ref. reopen of https://github.com/vmware-tanzu/velero/issues/2319
|
||||
// ref. reopen of https://github.com/velero-io/velero/issues/2319
|
||||
|
||||
b := builder.ForV1CustomResourceDefinition("test.velero.io")
|
||||
// 5 here is just an int value, it could be any other whole number.
|
||||
|
||||
@@ -33,17 +33,17 @@ import (
|
||||
utilrand "k8s.io/apimachinery/pkg/util/rand"
|
||||
crclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
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"
|
||||
kuberesource "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"
|
||||
riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2"
|
||||
uploaderUtil "github.com/vmware-tanzu/velero/pkg/uploader/util"
|
||||
"github.com/vmware-tanzu/velero/pkg/util"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
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"
|
||||
kuberesource "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"
|
||||
riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2"
|
||||
uploaderUtil "github.com/velero-io/velero/pkg/uploader/util"
|
||||
"github.com/velero-io/velero/pkg/util"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -36,16 +36,16 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/validation"
|
||||
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/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/vmware-tanzu/velero/pkg/util"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"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/label"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/util"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
)
|
||||
|
||||
func TestResetPVCSpec(t *testing.T) {
|
||||
|
||||
@@ -31,13 +31,13 @@ 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"
|
||||
plugincommon "github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/util"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/client"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
plugincommon "github.com/velero-io/velero/pkg/plugin/framework/common"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/util"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
)
|
||||
|
||||
// volumeSnapshotRestoreItemAction is a Velero restore item
|
||||
|
||||
@@ -31,12 +31,12 @@ 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/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/vmware-tanzu/velero/pkg/util"
|
||||
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/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/util"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -23,10 +23,10 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/csi"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/csi"
|
||||
)
|
||||
|
||||
// volumeSnapshotClassRestoreItemAction is a Velero restore
|
||||
|
||||
@@ -25,12 +25,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"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
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/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
//"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
func TestVSClassExecute(t *testing.T) {
|
||||
|
||||
@@ -27,13 +27,13 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
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"
|
||||
plugincommon "github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/util"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/csi"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/client"
|
||||
plugincommon "github.com/velero-io/velero/pkg/plugin/framework/common"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/util"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/csi"
|
||||
)
|
||||
|
||||
// volumeSnapshotContentRestoreItemAction is a restore item action
|
||||
|
||||
@@ -26,13 +26,13 @@ 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"
|
||||
"github.com/vmware-tanzu/velero/pkg/util"
|
||||
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"
|
||||
"github.com/velero-io/velero/pkg/util"
|
||||
)
|
||||
|
||||
func TestVSCExecute(t *testing.T) {
|
||||
|
||||
@@ -28,11 +28,11 @@ import (
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
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/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
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/label"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
type DataUploadRetrieveAction struct {
|
||||
|
||||
@@ -27,12 +27,12 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||
|
||||
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/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
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/label"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestDataUploadRetrieveActionExectue(t *testing.T) {
|
||||
|
||||
@@ -21,9 +21,9 @@ import (
|
||||
"github.com/sirupsen/logrus"
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/hook"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/internal/hook"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
// InitRestoreHookPodAction is a RestoreItemAction plugin applicable to pods that runs
|
||||
|
||||
@@ -26,11 +26,11 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
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 TestInitContainerRestoreHookPodActionExecute(t *testing.T) {
|
||||
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -27,8 +27,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestJobActionExecute(t *testing.T) {
|
||||
|
||||
@@ -25,8 +25,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
type PodAction struct {
|
||||
|
||||
@@ -26,9 +26,9 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"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 TestPodActionExecute(t *testing.T) {
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
@@ -33,16 +33,16 @@ import (
|
||||
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
|
||||
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
veleroimage "github.com/vmware-tanzu/velero/internal/velero"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/podvolume"
|
||||
"github.com/vmware-tanzu/velero/pkg/restorehelper"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
veleroutil "github.com/vmware-tanzu/velero/pkg/util/velero"
|
||||
veleroimage "github.com/velero-io/velero/internal/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework/common"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/podvolume"
|
||||
"github.com/velero-io/velero/pkg/restorehelper"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
veleroutil "github.com/velero-io/velero/pkg/util/velero"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -20,7 +20,7 @@ import (
|
||||
"sort"
|
||||
"testing"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
"github.com/stretchr/testify/assert"
|
||||
@@ -33,16 +33,16 @@ import (
|
||||
"k8s.io/client-go/kubernetes/fake"
|
||||
crfake "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/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"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/buildinfo"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
|
||||
"k8s.io/client-go/kubernetes/scheme"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/restorehelper"
|
||||
"github.com/velero-io/velero/pkg/restorehelper"
|
||||
)
|
||||
|
||||
func TestGetImage(t *testing.T) {
|
||||
|
||||
@@ -24,10 +24,10 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
|
||||
|
||||
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"
|
||||
"github.com/vmware-tanzu/velero/pkg/util"
|
||||
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"
|
||||
"github.com/velero-io/velero/pkg/util"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -28,10 +28,10 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/client-go/kubernetes/fake"
|
||||
|
||||
"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"
|
||||
"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"
|
||||
)
|
||||
|
||||
// TestPVCActionExecute runs the PVCAction's Execute
|
||||
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
)
|
||||
|
||||
// RoleBindingAction handle namespace remappings for role bindings
|
||||
|
||||
@@ -26,9 +26,9 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/test"
|
||||
api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestRoleBindingActionAppliesTo(t *testing.T) {
|
||||
|
||||
@@ -28,8 +28,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
// SecretAction is a restore item action for secrets
|
||||
|
||||
@@ -28,8 +28,8 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestSecretActionAppliesTo(t *testing.T) {
|
||||
|
||||
@@ -25,8 +25,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
type ServiceAccountAction struct {
|
||||
|
||||
@@ -27,8 +27,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestServiceAccountActionAppliesTo(t *testing.T) {
|
||||
|
||||
@@ -28,8 +28,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/util/sets"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
)
|
||||
|
||||
const annotationLastAppliedConfig = "kubectl.kubernetes.io/last-applied-configuration"
|
||||
|
||||
@@ -27,10 +27,10 @@ import (
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func svcJSON(ports ...corev1api.ServicePort) string {
|
||||
|
||||
@@ -25,7 +25,7 @@ import (
|
||||
corev1api "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
var mergedServiceAccountsBenchmarkResult *unstructured.Unstructured
|
||||
|
||||
@@ -27,9 +27,9 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/version"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/archive"
|
||||
"github.com/vmware-tanzu/velero/pkg/client"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/archive"
|
||||
"github.com/velero-io/velero/pkg/client"
|
||||
)
|
||||
|
||||
// ChosenGroupVersion is the API Group version that was selected to restore
|
||||
|
||||
@@ -23,8 +23,8 @@ import (
|
||||
corev1api "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func TestK8sPrioritySort(t *testing.T) {
|
||||
|
||||
@@ -25,10 +25,10 @@ import (
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/credentials"
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/internal/credentials"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
)
|
||||
|
||||
type PVRestorer interface {
|
||||
|
||||
@@ -27,12 +27,12 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
providermocks "github.com/vmware-tanzu/velero/pkg/plugin/velero/mocks/volumesnapshotter/v1"
|
||||
vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
providermocks "github.com/velero-io/velero/pkg/plugin/velero/mocks/volumesnapshotter/v1"
|
||||
vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
velerotest "github.com/velero-io/velero/pkg/test"
|
||||
)
|
||||
|
||||
func defaultBackup() *builder.BackupBuilder {
|
||||
|
||||
@@ -25,11 +25,11 @@ import (
|
||||
"github.com/sirupsen/logrus"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
|
||||
"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/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"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/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
+28
-28
@@ -52,33 +52,33 @@ import (
|
||||
"k8s.io/client-go/util/retry"
|
||||
crclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/credentials"
|
||||
"github.com/vmware-tanzu/velero/internal/hook"
|
||||
"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/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/itemoperation"
|
||||
"github.com/vmware-tanzu/velero/pkg/kuberesource"
|
||||
"github.com/vmware-tanzu/velero/pkg/label"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/framework"
|
||||
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
||||
riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2"
|
||||
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/podvolume/configs"
|
||||
"github.com/vmware-tanzu/velero/pkg/types"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/collections"
|
||||
csiutil "github.com/vmware-tanzu/velero/pkg/util/csi"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/filesystem"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/results"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/wildcard"
|
||||
"github.com/velero-io/velero/internal/credentials"
|
||||
"github.com/velero-io/velero/internal/hook"
|
||||
"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/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/itemoperation"
|
||||
"github.com/velero-io/velero/pkg/kuberesource"
|
||||
"github.com/velero-io/velero/pkg/label"
|
||||
"github.com/velero-io/velero/pkg/plugin/framework"
|
||||
"github.com/velero-io/velero/pkg/plugin/velero"
|
||||
riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2"
|
||||
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/podvolume/configs"
|
||||
"github.com/velero-io/velero/pkg/types"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/collections"
|
||||
csiutil "github.com/velero-io/velero/pkg/util/csi"
|
||||
"github.com/velero-io/velero/pkg/util/filesystem"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/pkg/util/results"
|
||||
"github.com/velero-io/velero/pkg/util/wildcard"
|
||||
)
|
||||
|
||||
const ObjectStatusRestoreAnnotationKey = "velero.io/restore-status"
|
||||
@@ -1789,7 +1789,7 @@ func isAlreadyExistsError(ctx *restoreContext, obj *unstructured.Unstructured, e
|
||||
// 1. For NodePort service, the service has nodePort preservation while the same nodePort service already exists. - Get invalid value error
|
||||
// 2. For LoadBalancer service, the "healthCheckNodePort" already exists. - Get internal error
|
||||
// If this is the case, the function returns true to avoid reporting error.
|
||||
// Refer to https://github.com/vmware-tanzu/velero/issues/2308 for more details
|
||||
// Refer to https://github.com/velero-io/velero/issues/2308 for more details
|
||||
if obj.GetKind() != "Service" {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
+21
-21
@@ -25,8 +25,8 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/collections"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
"github.com/velero-io/velero/pkg/util/collections"
|
||||
|
||||
snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
|
||||
"github.com/pkg/errors"
|
||||
@@ -45,25 +45,25 @@ import (
|
||||
"k8s.io/client-go/dynamic"
|
||||
kubetesting "k8s.io/client-go/testing"
|
||||
|
||||
"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/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/plugin/velero"
|
||||
riav2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/restoreitemaction/v2"
|
||||
vsv1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/podvolume"
|
||||
uploadermocks "github.com/vmware-tanzu/velero/pkg/podvolume/mocks"
|
||||
"github.com/vmware-tanzu/velero/pkg/test"
|
||||
"github.com/vmware-tanzu/velero/pkg/types"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
. "github.com/vmware-tanzu/velero/pkg/util/results"
|
||||
"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/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/plugin/velero"
|
||||
riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2"
|
||||
vsv1 "github.com/velero-io/velero/pkg/plugin/velero/volumesnapshotter/v1"
|
||||
"github.com/velero-io/velero/pkg/podvolume"
|
||||
uploadermocks "github.com/velero-io/velero/pkg/podvolume/mocks"
|
||||
"github.com/velero-io/velero/pkg/test"
|
||||
"github.com/velero-io/velero/pkg/types"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
kubeutil "github.com/velero-io/velero/pkg/util/kube"
|
||||
. "github.com/velero-io/velero/pkg/util/results"
|
||||
)
|
||||
|
||||
func TestRestorePVWithVolumeInfo(t *testing.T) {
|
||||
|
||||
@@ -23,8 +23,8 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/archive"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/archive"
|
||||
)
|
||||
|
||||
func TestExpandNamespaceWildcards(t *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user