mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-08-16 12:16:06 +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
+2
-2
@@ -180,8 +180,8 @@ make test-e2e
|
||||
```
|
||||
|
||||
Please refer to `velero-plugin-for-microsoft-azure` documentation for instruction:
|
||||
* [set up permissions for Velero](https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure#set-permissions-for-velero)
|
||||
* [set up azure storage account and blob container](https://github.com/vmware-tanzu/velero-plugin-for-microsoft-azure#setup-azure-storage-account-and-blob-container)
|
||||
* [set up permissions for Velero](https://github.com/velero-io/velero-plugin-for-microsoft-azure#set-permissions-for-velero)
|
||||
* [set up azure storage account and blob container](https://github.com/velero-io/velero-plugin-for-microsoft-azure#setup-azure-storage-account-and-blob-container)
|
||||
|
||||
1. Run Multi-API group and version tests using MinIO as the backup storage location:
|
||||
``` bash
|
||||
|
||||
@@ -25,11 +25,11 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/kibishii"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/kibishii"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
type BackupRestoreTestConfig struct {
|
||||
@@ -208,7 +208,7 @@ func BackupRestoreTest(backupRestoreTestConfig BackupRestoreTestConfig) {
|
||||
)).To(Succeed())
|
||||
|
||||
// We limit the length of backup name here to avoid the issue of vsphere plugin
|
||||
// https://github.com/vmware-tanzu/velero-plugin-for-vsphere/issues/370
|
||||
// https://github.com/velero-io/velero-plugin-for-vsphere/issues/370
|
||||
// We can remove the logic once the issue is fixed
|
||||
backupName = "backup-" + common.AdditionalBSLName
|
||||
restoreName = "restore-" + common.AdditionalBSLName
|
||||
|
||||
@@ -27,11 +27,11 @@ import (
|
||||
. "github.com/onsi/gomega"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/kibishii"
|
||||
. "github.com/vmware-tanzu/velero/test/util/providers"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/kibishii"
|
||||
. "github.com/velero-io/velero/test/util/providers"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
// Test backup and restore of Kibishii using restic
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
* /
|
||||
*/
|
||||
|
||||
// Refer to https://github.com/vmware-tanzu/velero/issues/4253
|
||||
// Refer to https://github.com/velero-io/velero/issues/4253
|
||||
package backups
|
||||
|
||||
import (
|
||||
@@ -30,10 +30,10 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/providers"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/providers"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
type SyncBackups struct {
|
||||
|
||||
@@ -30,11 +30,11 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/kibishii"
|
||||
. "github.com/vmware-tanzu/velero/test/util/providers"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/kibishii"
|
||||
. "github.com/velero-io/velero/test/util/providers"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
type TTL struct {
|
||||
|
||||
@@ -24,9 +24,9 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
func APIExtensionsVersionsTest() {
|
||||
|
||||
@@ -34,11 +34,11 @@ import (
|
||||
corev1api "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
var veleroCfg VeleroConfig
|
||||
|
||||
@@ -27,11 +27,11 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
corev1api "k8s.io/api/core/v1"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
type BackupVolumeInfo struct {
|
||||
@@ -144,7 +144,7 @@ func (v *BackupVolumeInfo) CreateResources() error {
|
||||
|
||||
for _, pod := range podList.Items {
|
||||
for i := 0; i <= pvcCount-1; i++ {
|
||||
// Hitting issue https://github.com/vmware-tanzu/velero/issues/7388
|
||||
// Hitting issue https://github.com/velero-io/velero/issues/7388
|
||||
// So populate data only to some of pods, leave other pods empty to verify empty PV datamover
|
||||
if i%2 == 0 {
|
||||
Expect(CreateFileToPod(
|
||||
|
||||
@@ -21,9 +21,9 @@ import (
|
||||
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/providers"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/providers"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
var CSIDataMoverVolumeInfoTest func() = TestFunc(&CSIDataMoverVolumeInfo{
|
||||
|
||||
@@ -21,9 +21,9 @@ import (
|
||||
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/providers"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/providers"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
var CSISnapshotVolumeInfoTest func() = TestFunc(&CSISnapshotVolumeInfo{
|
||||
|
||||
@@ -21,9 +21,9 @@ import (
|
||||
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/providers"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/providers"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
var FilesystemUploadVolumeInfoTest func() = TestFunc(&FilesystemUploadVolumeInfo{
|
||||
|
||||
@@ -21,9 +21,9 @@ import (
|
||||
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/providers"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/providers"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
var NativeSnapshotVolumeInfoTest func() = TestFunc(&NativeSnapshotVolumeInfo{
|
||||
|
||||
@@ -21,9 +21,9 @@ import (
|
||||
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/providers"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/providers"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
var SkippedVolumeInfoTest func() = TestFunc(&SkippedVolumeInfo{
|
||||
|
||||
@@ -8,9 +8,9 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/kibishii"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/kibishii"
|
||||
)
|
||||
|
||||
type NamespaceMapping struct {
|
||||
|
||||
@@ -10,10 +10,10 @@ import (
|
||||
corev1api "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/util/intstr"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
type NodePort struct {
|
||||
|
||||
@@ -25,8 +25,8 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
type MultiNSBackup struct {
|
||||
|
||||
@@ -22,8 +22,8 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
type NSAnnotationCase struct {
|
||||
|
||||
@@ -39,8 +39,8 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
type RBACCase struct {
|
||||
|
||||
@@ -33,7 +33,7 @@ limitations under the License.
|
||||
package basic
|
||||
|
||||
import (
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
)
|
||||
|
||||
func GetResourcesCheckTestCases() []VeleroBackupRestoreTest {
|
||||
|
||||
@@ -24,10 +24,10 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
"github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
// RestoreExecHooks tests that a pod with multiple restore exec hooks does not hang
|
||||
|
||||
@@ -7,12 +7,12 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
type StorageClasssChanging struct {
|
||||
|
||||
@@ -27,11 +27,11 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/kibishii"
|
||||
. "github.com/vmware-tanzu/velero/test/util/providers"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/kibishii"
|
||||
. "github.com/velero-io/velero/test/util/providers"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -143,7 +143,7 @@ func BslDeletionTest(useVolumeSnapshots bool) {
|
||||
podName2 := "kibishii-deployment-1"
|
||||
|
||||
label1 := "for=1"
|
||||
// TODO remove when issue https://github.com/vmware-tanzu/velero/issues/4724 is fixed
|
||||
// TODO remove when issue https://github.com/velero-io/velero/issues/4724 is fixed
|
||||
//label2 := "for!=1"
|
||||
label2 := "for=2"
|
||||
By("Create namespace for sample workload", func() {
|
||||
|
||||
+24
-24
@@ -29,30 +29,30 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/cmd/cli/install"
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/backup"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/backups"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/basic"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/basic/api-group"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/basic/backup-volume-info"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/basic/resources-check"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/bsl-mgmt"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/migration"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/nodeagentconfig"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/parallelfilesdownload"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/parallelfilesupload"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/privilegesmgmt"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/pv-backup"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/repomaintenance"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/resource-filtering"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/resourcemodifiers"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/resourcepolicies"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/scale"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/schedule"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/upgrade"
|
||||
"github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
veleroutil "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
"github.com/velero-io/velero/pkg/cmd/cli/install"
|
||||
"github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/e2e/backup"
|
||||
. "github.com/velero-io/velero/test/e2e/backups"
|
||||
. "github.com/velero-io/velero/test/e2e/basic"
|
||||
. "github.com/velero-io/velero/test/e2e/basic/api-group"
|
||||
. "github.com/velero-io/velero/test/e2e/basic/backup-volume-info"
|
||||
. "github.com/velero-io/velero/test/e2e/basic/resources-check"
|
||||
. "github.com/velero-io/velero/test/e2e/bsl-mgmt"
|
||||
. "github.com/velero-io/velero/test/e2e/migration"
|
||||
. "github.com/velero-io/velero/test/e2e/nodeagentconfig"
|
||||
. "github.com/velero-io/velero/test/e2e/parallelfilesdownload"
|
||||
. "github.com/velero-io/velero/test/e2e/parallelfilesupload"
|
||||
. "github.com/velero-io/velero/test/e2e/privilegesmgmt"
|
||||
. "github.com/velero-io/velero/test/e2e/pv-backup"
|
||||
. "github.com/velero-io/velero/test/e2e/repomaintenance"
|
||||
. "github.com/velero-io/velero/test/e2e/resource-filtering"
|
||||
. "github.com/velero-io/velero/test/e2e/resourcemodifiers"
|
||||
. "github.com/velero-io/velero/test/e2e/resourcepolicies"
|
||||
. "github.com/velero-io/velero/test/e2e/scale"
|
||||
. "github.com/velero-io/velero/test/e2e/schedule"
|
||||
. "github.com/velero-io/velero/test/e2e/upgrade"
|
||||
"github.com/velero-io/velero/test/util/k8s"
|
||||
veleroutil "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -24,14 +24,14 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
framework "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
util "github.com/vmware-tanzu/velero/test/util/csi"
|
||||
k8sutil "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
"github.com/vmware-tanzu/velero/test/util/kibishii"
|
||||
"github.com/vmware-tanzu/velero/test/util/providers"
|
||||
veleroutil "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
"github.com/velero-io/velero/test"
|
||||
framework "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
util "github.com/velero-io/velero/test/util/csi"
|
||||
k8sutil "github.com/velero-io/velero/test/util/k8s"
|
||||
"github.com/velero-io/velero/test/util/kibishii"
|
||||
"github.com/velero-io/velero/test/util/providers"
|
||||
veleroutil "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
const BackupObjectsPrefix = "backups"
|
||||
@@ -283,7 +283,7 @@ func (m *migrationE2E) Backup() error {
|
||||
})
|
||||
} else {
|
||||
// the snapshots of AWS may be still in pending status when do the restore.
|
||||
// wait for a while to avoid this https://github.com/vmware-tanzu/velero/issues/1799
|
||||
// wait for a while to avoid this https://github.com/velero-io/velero/issues/1799
|
||||
if OriginVeleroCfg.CloudProvider == test.Azure &&
|
||||
strings.EqualFold(OriginVeleroCfg.Features, test.FeatureCSI) ||
|
||||
OriginVeleroCfg.CloudProvider == test.AWS {
|
||||
|
||||
@@ -29,13 +29,13 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
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/test"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
k8sutil "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
veleroutil "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
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/test"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
k8sutil "github.com/velero-io/velero/test/util/k8s"
|
||||
veleroutil "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
type CachePVCTestCase struct {
|
||||
|
||||
@@ -31,15 +31,15 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
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"
|
||||
velerotypes "github.com/vmware-tanzu/velero/pkg/types"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
k8sutil "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
veleroutil "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
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"
|
||||
velerotypes "github.com/velero-io/velero/pkg/types"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
k8sutil "github.com/velero-io/velero/test/util/k8s"
|
||||
veleroutil "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
type NodeAgentConfigTestCase struct {
|
||||
|
||||
@@ -22,10 +22,10 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
type ParallelFilesDownload struct {
|
||||
|
||||
@@ -22,10 +22,10 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
type ParallelFilesUpload struct {
|
||||
|
||||
@@ -29,10 +29,10 @@ import (
|
||||
waitutil "k8s.io/apimachinery/pkg/util/wait"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
v1 "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
func SSRTest() {
|
||||
|
||||
@@ -10,11 +10,11 @@ import (
|
||||
. "github.com/onsi/gomega"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
type PVBackupFiltering struct {
|
||||
|
||||
@@ -29,15 +29,15 @@ import (
|
||||
"k8s.io/apimachinery/pkg/labels"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
velerotypes "github.com/vmware-tanzu/velero/pkg/types"
|
||||
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
velerokubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
k8sutil "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
veleroutil "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
velerotypes "github.com/velero-io/velero/pkg/types"
|
||||
"github.com/velero-io/velero/pkg/util/kube"
|
||||
velerokubeutil "github.com/velero-io/velero/pkg/util/kube"
|
||||
"github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
k8sutil "github.com/velero-io/velero/test/util/k8s"
|
||||
veleroutil "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
type RepoMaintenanceTestCase struct {
|
||||
|
||||
@@ -23,9 +23,9 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
type FilteringCase struct {
|
||||
|
||||
@@ -24,10 +24,10 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
/*
|
||||
|
||||
@@ -23,8 +23,8 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
/*
|
||||
|
||||
@@ -24,9 +24,9 @@ import (
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
/*
|
||||
|
||||
@@ -23,8 +23,8 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
/*
|
||||
|
||||
@@ -24,8 +24,8 @@ import (
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
/*
|
||||
|
||||
@@ -24,9 +24,9 @@ import (
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
/*
|
||||
|
||||
@@ -23,8 +23,8 @@ import (
|
||||
. "github.com/onsi/gomega"
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
// WildcardNamespaces tests the inclusion and exclusion of namespaces using wildcards
|
||||
|
||||
@@ -24,9 +24,9 @@ import (
|
||||
. "github.com/onsi/gomega"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
var yamlData = `
|
||||
|
||||
@@ -27,10 +27,10 @@ import (
|
||||
corev1api "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
const FileName = "test-data.txt"
|
||||
|
||||
@@ -17,8 +17,8 @@ limitations under the License.
|
||||
package scale
|
||||
|
||||
import (
|
||||
basic "github.com/vmware-tanzu/velero/test/e2e/basic/resources-check"
|
||||
. "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
basic "github.com/velero-io/velero/test/e2e/basic/resources-check"
|
||||
. "github.com/velero-io/velero/test/e2e/test"
|
||||
)
|
||||
|
||||
var MultiNSBackupRestore func() = TestFunc(&basic.MultiNSBackup{IsScaleTest: true})
|
||||
|
||||
@@ -11,12 +11,12 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
framework "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
k8sutil "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
veleroutil "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/test"
|
||||
framework "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
k8sutil "github.com/velero-io/velero/test/util/k8s"
|
||||
veleroutil "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
var ScheduleInProgressTest func() = framework.TestFunc(&InProgressCase{})
|
||||
|
||||
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
//the ordered resources test related to https://github.com/vmware-tanzu/velero/issues/4561
|
||||
//the ordered resources test related to https://github.com/velero-io/velero/issues/4561
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
@@ -30,11 +30,11 @@ import (
|
||||
waitutil "k8s.io/apimachinery/pkg/util/wait"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
framework "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
k8sutil "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
veleroutil "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
framework "github.com/velero-io/velero/test/e2e/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
k8sutil "github.com/velero-io/velero/test/util/k8s"
|
||||
veleroutil "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
var ScheduleOrderedResources func() = framework.TestFunc(&OrderedResources{})
|
||||
|
||||
@@ -10,10 +10,10 @@ import (
|
||||
. "github.com/onsi/gomega"
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
framework "github.com/vmware-tanzu/velero/test/e2e/test"
|
||||
k8sutil "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
veleroutil "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
framework "github.com/velero-io/velero/test/e2e/test"
|
||||
k8sutil "github.com/velero-io/velero/test/util/k8s"
|
||||
veleroutil "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
type PeriodicalCase struct {
|
||||
|
||||
@@ -27,10 +27,10 @@ import (
|
||||
. "github.com/onsi/gomega"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
/*
|
||||
@@ -146,8 +146,8 @@ func (t *TestCase) Restore() error {
|
||||
veleroCfg := t.GetTestCase().VeleroCfg
|
||||
|
||||
// the snapshots of AWS may be still in pending status when do the restore, wait for a while
|
||||
// to avoid this https://github.com/vmware-tanzu/velero/issues/1799
|
||||
// TODO remove this after https://github.com/vmware-tanzu/velero/issues/3533 is fixed
|
||||
// to avoid this https://github.com/velero-io/velero/issues/1799
|
||||
// TODO remove this after https://github.com/velero-io/velero/issues/3533 is fixed
|
||||
By("Waiting 5 minutes to make sure the snapshots are ready...", func() {
|
||||
if t.UseVolumeSnapshots && veleroCfg.CloudProvider != Vsphere {
|
||||
time.Sleep(5 * time.Minute)
|
||||
|
||||
@@ -26,11 +26,11 @@ import (
|
||||
. "github.com/onsi/ginkgo/v2"
|
||||
. "github.com/onsi/gomega"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/kibishii"
|
||||
. "github.com/vmware-tanzu/velero/test/util/providers"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/kibishii"
|
||||
. "github.com/velero-io/velero/test/util/providers"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
var upgradeNamespace string
|
||||
@@ -236,8 +236,8 @@ func BackupUpgradeRestoreTest(useVolumeSnapshots bool, veleroCLI2Version VeleroC
|
||||
})
|
||||
}
|
||||
// the snapshots of AWS may be still in pending status when do the restore, wait for a while
|
||||
// to avoid this https://github.com/vmware-tanzu/velero/issues/1799
|
||||
// TODO remove this after https://github.com/vmware-tanzu/velero/issues/3533 is fixed
|
||||
// to avoid this https://github.com/velero-io/velero/issues/1799
|
||||
// TODO remove this after https://github.com/velero-io/velero/issues/3533 is fixed
|
||||
if tmpCfg.CloudProvider == AWS && useVolumeSnapshots {
|
||||
fmt.Println("Waiting 5 minutes to make sure the snapshots are ready...")
|
||||
time.Sleep(5 * time.Minute)
|
||||
|
||||
+1
-1
@@ -2,4 +2,4 @@
|
||||
|
||||
Document for running Velero end-to-end performance test suite.
|
||||
|
||||
And the data generate tool for performance test could be found in [here](https://github.com/vmware-tanzu/velero-performance-test)
|
||||
And the data generate tool for performance test could be found in [here](https://github.com/velero-io/velero-performance-test)
|
||||
@@ -21,8 +21,8 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/perf/test"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/perf/test"
|
||||
)
|
||||
|
||||
type BackupTest struct {
|
||||
|
||||
@@ -23,9 +23,9 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/perf/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/perf/test"
|
||||
"github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
type BasicTest struct {
|
||||
|
||||
@@ -27,15 +27,15 @@ import (
|
||||
. "github.com/onsi/gomega"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/cmd/cli/install"
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
"github.com/vmware-tanzu/velero/test/perf/backup"
|
||||
"github.com/vmware-tanzu/velero/test/perf/basic"
|
||||
"github.com/vmware-tanzu/velero/test/perf/restore"
|
||||
"github.com/vmware-tanzu/velero/test/perf/test"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
"github.com/vmware-tanzu/velero/test/util/report"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
"github.com/velero-io/velero/pkg/cmd/cli/install"
|
||||
. "github.com/velero-io/velero/test"
|
||||
"github.com/velero-io/velero/test/perf/backup"
|
||||
"github.com/velero-io/velero/test/perf/basic"
|
||||
"github.com/velero-io/velero/test/perf/restore"
|
||||
"github.com/velero-io/velero/test/perf/test"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
"github.com/velero-io/velero/test/util/report"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -19,7 +19,7 @@ package metrics
|
||||
import (
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test/util/metrics"
|
||||
"github.com/velero-io/velero/test/util/metrics"
|
||||
)
|
||||
|
||||
const MinioDesc = "Minio disk usage"
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test/util/metrics"
|
||||
"github.com/velero-io/velero/test/util/metrics"
|
||||
)
|
||||
|
||||
const NFSDesc = "NFS disk usage"
|
||||
|
||||
@@ -26,7 +26,7 @@ import (
|
||||
|
||||
metricsclientset "k8s.io/metrics/pkg/client/clientset/versioned"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test/util/metrics"
|
||||
"github.com/velero-io/velero/test/util/metrics"
|
||||
)
|
||||
|
||||
const PodResourceDesc = "Resource consumption"
|
||||
|
||||
@@ -22,10 +22,10 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test/perf/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test/perf/test"
|
||||
"github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
type RestoreTest struct {
|
||||
|
||||
@@ -26,13 +26,13 @@ import (
|
||||
. "github.com/onsi/gomega"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
"github.com/vmware-tanzu/velero/test/perf/metrics"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
"github.com/vmware-tanzu/velero/test/util/report"
|
||||
"github.com/vmware-tanzu/velero/test/util/velero"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
. "github.com/velero-io/velero/test"
|
||||
"github.com/velero-io/velero/test/perf/metrics"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
"github.com/velero-io/velero/test/util/report"
|
||||
"github.com/velero-io/velero/test/util/velero"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
/*
|
||||
|
||||
@@ -24,7 +24,7 @@ import (
|
||||
"k8s.io/client-go/rest"
|
||||
"k8s.io/client-go/tools/clientcmd"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/buildinfo"
|
||||
"github.com/velero-io/velero/pkg/buildinfo"
|
||||
)
|
||||
|
||||
func buildConfigFromFlags(context, kubeconfigPath string, precedence []string) (*rest.Config, error) {
|
||||
|
||||
@@ -32,8 +32,8 @@ import (
|
||||
"k8s.io/client-go/rest"
|
||||
metricsclientset "k8s.io/metrics/pkg/client/clientset/versioned"
|
||||
|
||||
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"
|
||||
)
|
||||
|
||||
// Factory knows how to create a VeleroClient and Kubernetes client.
|
||||
|
||||
+2
-2
@@ -21,8 +21,8 @@ import (
|
||||
|
||||
"github.com/google/uuid"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/cmd/cli/install"
|
||||
"github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
"github.com/velero-io/velero/pkg/cmd/cli/install"
|
||||
"github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
// e2e-storage-class is the default StorageClass for E2E.
|
||||
|
||||
@@ -28,7 +28,7 @@ import (
|
||||
"k8s.io/client-go/kubernetes"
|
||||
"k8s.io/client-go/tools/clientcmd"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
func GetClients() (*kubernetes.Clientset, *snapshotterClientSet.Clientset, error) {
|
||||
|
||||
@@ -26,7 +26,7 @@ import (
|
||||
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
)
|
||||
|
||||
func KubectlDeleteIAMServiceAcount(ctx context.Context, name, namespace, cluster string) error {
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
metricsclientset "k8s.io/metrics/pkg/client/clientset/versioned"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test/pkg/client"
|
||||
"github.com/velero-io/velero/test/pkg/client"
|
||||
)
|
||||
|
||||
// TestClient contains different API clients that are in use throughout
|
||||
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
|
||||
"context"
|
||||
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
)
|
||||
|
||||
func KubectlDeleteClusterRoleBinding(ctx context.Context, name string) error {
|
||||
|
||||
@@ -30,9 +30,9 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
common "github.com/vmware-tanzu/velero/test/util/common"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
common "github.com/velero-io/velero/test/util/common"
|
||||
)
|
||||
|
||||
// ensureClusterExists returns whether or not a Kubernetes cluster exists for tests to be run on.
|
||||
|
||||
@@ -26,7 +26,7 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
)
|
||||
|
||||
func InstallCRD(ctx context.Context, yaml string) error {
|
||||
|
||||
@@ -29,8 +29,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
clientset "k8s.io/client-go/kubernetes"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
common "github.com/vmware-tanzu/velero/test/util/common"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
common "github.com/velero-io/velero/test/util/common"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -31,8 +31,8 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
waitutil "k8s.io/apimachinery/pkg/util/wait"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
)
|
||||
|
||||
func CreateNamespace(ctx context.Context, client TestClient, namespace string) error {
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
|
||||
common "github.com/vmware-tanzu/velero/test/util/common"
|
||||
common "github.com/velero-io/velero/test/util/common"
|
||||
)
|
||||
|
||||
func GetWorkerNodes(ctx context.Context, workerOS string) ([]string, error) {
|
||||
|
||||
@@ -27,8 +27,8 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
common "github.com/vmware-tanzu/velero/test/util/common"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
common "github.com/velero-io/velero/test/util/common"
|
||||
)
|
||||
|
||||
func CreatePod(
|
||||
|
||||
@@ -29,7 +29,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
)
|
||||
|
||||
func WaitUntilServiceAccountCreated(ctx context.Context, client TestClient, namespace, serviceAccount string, timeout time.Duration) error {
|
||||
|
||||
@@ -24,7 +24,7 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
)
|
||||
|
||||
func ScaleStatefulSet(ctx context.Context, namespace, name string, replicas int) error {
|
||||
|
||||
@@ -35,12 +35,12 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
"sigs.k8s.io/yaml"
|
||||
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/providers"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
. "github.com/velero-io/velero/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/providers"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -19,7 +19,7 @@ package metrics
|
||||
import (
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test/util/providers"
|
||||
"github.com/velero-io/velero/test/util/providers"
|
||||
)
|
||||
|
||||
func GetMinioDiskUsage(cloudCredentialsFile string, bslBucket string, bslPrefix string, bslConfig string) (int64, error) {
|
||||
|
||||
@@ -38,8 +38,8 @@ import (
|
||||
s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
"github.com/velero-io/velero/pkg/cmd/util/flag"
|
||||
"github.com/velero-io/velero/test"
|
||||
)
|
||||
|
||||
type AWSStorage string
|
||||
|
||||
@@ -39,8 +39,8 @@ import (
|
||||
"github.com/joho/godotenv"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
"github.com/velero-io/velero/pkg/cmd/util/flag"
|
||||
. "github.com/velero-io/velero/test"
|
||||
)
|
||||
|
||||
type AzureStorage string
|
||||
|
||||
@@ -27,9 +27,9 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
velerotest "github.com/vmware-tanzu/velero/test"
|
||||
velero "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
velerotest "github.com/velero-io/velero/test"
|
||||
velero "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
type ObjectsInStorage interface {
|
||||
|
||||
@@ -32,7 +32,7 @@ import (
|
||||
"google.golang.org/api/iterator"
|
||||
"google.golang.org/api/option"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
"github.com/velero-io/velero/test"
|
||||
)
|
||||
|
||||
type GCSStorage string
|
||||
|
||||
@@ -22,7 +22,7 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
"gopkg.in/yaml.v3"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
"github.com/velero-io/velero/test"
|
||||
)
|
||||
|
||||
func GenerateYamlReport() error {
|
||||
|
||||
+10
-10
@@ -39,13 +39,13 @@ import (
|
||||
clientset "k8s.io/client-go/kubernetes"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/cmd/cli/install"
|
||||
velerexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
common "github.com/vmware-tanzu/velero/test/util/common"
|
||||
eksutil "github.com/vmware-tanzu/velero/test/util/eks"
|
||||
"github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/cmd/cli/install"
|
||||
velerexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
"github.com/velero-io/velero/test"
|
||||
common "github.com/velero-io/velero/test/util/common"
|
||||
eksutil "github.com/velero-io/velero/test/util/eks"
|
||||
"github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
// we provide more install options other than the standard install.InstallOptions in E2E test
|
||||
@@ -222,7 +222,7 @@ func VeleroInstall(ctx context.Context, veleroCfg *test.VeleroConfig, isStandbyC
|
||||
}
|
||||
|
||||
// generateVSpherePlugin refers to
|
||||
// https://github.com/vmware-tanzu/velero-plugin-for-vsphere/blob/v1.3.0/docs/vanilla.md
|
||||
// https://github.com/velero-io/velero-plugin-for-vsphere/blob/v1.3.0/docs/vanilla.md
|
||||
func generateVSpherePlugin(veleroCfg *test.VeleroConfig) error {
|
||||
cli := veleroCfg.ClientToInstallVelero
|
||||
|
||||
@@ -927,7 +927,7 @@ func VeleroUninstall(ctx context.Context, veleroCfg test.VeleroConfig) error {
|
||||
}
|
||||
|
||||
// createVCCredentialSecret refer to
|
||||
// https://github.com/vmware-tanzu/velero-plugin-for-vsphere/blob/v1.3.0/docs/vanilla.md
|
||||
// https://github.com/velero-io/velero-plugin-for-vsphere/blob/v1.3.0/docs/vanilla.md
|
||||
func createVCCredentialSecret(c clientset.Interface, veleroNamespace string) error {
|
||||
secret, err := getVCCredentialSecret(c)
|
||||
if err != nil {
|
||||
@@ -970,7 +970,7 @@ func createVCCredentialSecret(c clientset.Interface, veleroNamespace string) err
|
||||
return nil
|
||||
}
|
||||
|
||||
// Reference https://github.com/vmware-tanzu/velero-plugin-for-vsphere/blob/main/docs/vanilla.md#create-vc-credential-secret
|
||||
// Reference https://github.com/velero-io/velero-plugin-for-vsphere/blob/main/docs/vanilla.md#create-vc-credential-secret
|
||||
// Read secret from kube-system namespace first, if not found, try with vmware-system-csi.
|
||||
func getVCCredentialSecret(c clientset.Interface) (secret *corev1api.Secret, err error) {
|
||||
secret, err = k8s.GetSecret(c, test.KubeSystemNamespace, "vsphere-config-secret")
|
||||
|
||||
@@ -45,16 +45,16 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
cliinstall "github.com/vmware-tanzu/velero/pkg/cmd/cli/install"
|
||||
"github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
common "github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
cliinstall "github.com/velero-io/velero/pkg/cmd/cli/install"
|
||||
"github.com/velero-io/velero/pkg/cmd/util/flag"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
"github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test"
|
||||
common "github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
const BackupObjectsPrefix = "backups"
|
||||
@@ -477,7 +477,7 @@ func VeleroBackupNamespace(ctx context.Context, veleroCLI, veleroNamespace strin
|
||||
args = append(args, "--default-volumes-to-fs-backup")
|
||||
}
|
||||
|
||||
// To workaround https://github.com/vmware-tanzu/velero-plugin-for-vsphere/issues/347 for vsphere plugin v1.1.1
|
||||
// To workaround https://github.com/velero-io/velero-plugin-for-vsphere/issues/347 for vsphere plugin v1.1.1
|
||||
// if the "--snapshot-volumes=false" isn't specified explicitly, the vSphere plugin will always take snapshots
|
||||
// for the volumes even though the "--default-volumes-to-fs-backup" is specified
|
||||
// TODO This can be removed if the logic of vSphere plugin bump up to 1.3
|
||||
@@ -946,7 +946,7 @@ func InstallVeleroCLI(ctx context.Context, version string) (string, error) {
|
||||
postfix := ".tar.gz"
|
||||
tarball := name + postfix
|
||||
err := wait.PollUntilContextTimeout(ctx, time.Second*5, time.Minute*5, true, func(ctx context.Context) (bool, error) {
|
||||
tempFile, err := getVeleroCliTarball("https://github.com/vmware-tanzu/velero/releases/download/" + version + "/" + tarball)
|
||||
tempFile, err := getVeleroCliTarball("https://github.com/velero-io/velero/releases/download/" + version + "/" + tarball)
|
||||
if err != nil {
|
||||
return false, errors.WithMessagef(err, "failed to get Velero CLI tarball")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user