From c9ba808bf1a2c5ee01aadf6d33c12ce05209f00f Mon Sep 17 00:00:00 2001 From: danfengl Date: Tue, 6 Feb 2024 03:01:15 +0000 Subject: [PATCH] Fix wrong usage of global velerocfg var, further PR Signed-off-by: danfengl --- test/e2e/basic/namespace-mapping.go | 3 --- test/e2e/basic/nodeport.go | 3 --- test/e2e/basic/pvc-selected-node-changing.go | 2 -- test/e2e/basic/resources-check/namespaces.go | 4 ---- test/e2e/basic/resources-check/namespaces_annotation.go | 3 --- test/e2e/basic/resources-check/rbac.go | 3 --- test/e2e/basic/storage-class-changing.go | 2 -- test/e2e/migration/migration.go | 2 +- test/e2e/pv-backup/pv-backup-filter.go | 2 -- test/e2e/resource-filtering/base.go | 3 --- test/e2e/resourcemodifiers/resource_modifiers.go | 3 --- test/e2e/resourcepolicies/resource_policies.go | 2 -- test/e2e/schedule/ordered_resources.go | 3 --- test/e2e/schedule/schedule-backup-creation.go | 5 +---- test/e2e/schedule/schedule.go | 3 --- test/e2e/test/test.go | 2 ++ 16 files changed, 4 insertions(+), 41 deletions(-) diff --git a/test/e2e/basic/namespace-mapping.go b/test/e2e/basic/namespace-mapping.go index ddde940fe..c85fe247e 100644 --- a/test/e2e/basic/namespace-mapping.go +++ b/test/e2e/basic/namespace-mapping.go @@ -9,7 +9,6 @@ import ( . "github.com/onsi/ginkgo" . "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/k8s" . "github.com/vmware-tanzu/velero/test/util/kibishii" @@ -33,8 +32,6 @@ func (n *NamespaceMapping) Init() error { n.CaseBaseName = "ns-mp-" + n.UUIDgen n.BackupName = "backup-" + n.CaseBaseName n.RestoreName = "restore-" + n.CaseBaseName - n.VeleroCfg = VeleroCfg - n.Client = *n.VeleroCfg.ClientToInstallVelero n.VeleroCfg.UseVolumeSnapshots = n.UseVolumeSnapshots n.VeleroCfg.UseNodeAgent = !n.UseVolumeSnapshots n.kibishiiData = &KibishiiData{Levels: 2, DirsPerLevel: 10, FilesPerLevel: 10, FileLength: 1024, BlockSize: 1024, PassNum: 0, ExpectedNodes: 2} diff --git a/test/e2e/basic/nodeport.go b/test/e2e/basic/nodeport.go index fdc4fe1f6..811e2fca4 100644 --- a/test/e2e/basic/nodeport.go +++ b/test/e2e/basic/nodeport.go @@ -12,7 +12,6 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" 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/k8s" . "github.com/vmware-tanzu/velero/test/util/velero" @@ -36,8 +35,6 @@ func (n *NodePort) Init() error { n.BackupName = "backup-" + n.CaseBaseName n.RestoreName = "restore-" + n.CaseBaseName n.serviceName = "nginx-service-" + n.CaseBaseName - n.VeleroCfg = VeleroCfg - n.Client = *n.VeleroCfg.ClientToInstallVelero n.NamespacesTotal = 1 n.TestMsg = &TestMSG{ Desc: "Nodeport preservation", diff --git a/test/e2e/basic/pvc-selected-node-changing.go b/test/e2e/basic/pvc-selected-node-changing.go index 1634c8bdd..d9227f101 100644 --- a/test/e2e/basic/pvc-selected-node-changing.go +++ b/test/e2e/basic/pvc-selected-node-changing.go @@ -37,8 +37,6 @@ func (p *PVCSelectedNodeChanging) Init() error { p.CaseBaseName = "psnc-" + p.UUIDgen p.namespace = p.CaseBaseName p.mappedNS = p.namespace + "-mapped" - p.VeleroCfg = VeleroCfg - p.Client = *p.VeleroCfg.ClientToInstallVelero p.TestMsg = &TestMSG{ Desc: "Changing PVC node selector", FailedMSG: "Failed to changing PVC node selector", diff --git a/test/e2e/basic/resources-check/namespaces.go b/test/e2e/basic/resources-check/namespaces.go index 78386fb9b..e4a88d4a7 100644 --- a/test/e2e/basic/resources-check/namespaces.go +++ b/test/e2e/basic/resources-check/namespaces.go @@ -25,7 +25,6 @@ import ( "github.com/pkg/errors" v1 "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" ) @@ -42,9 +41,6 @@ func (m *MultiNSBackup) Init() error { m.CaseBaseName = "nstest-" + m.UUIDgen m.BackupName = "backup-" + m.CaseBaseName m.RestoreName = "restore-" + m.CaseBaseName - - m.VeleroCfg = VeleroCfg - m.Client = *m.VeleroCfg.ClientToInstallVelero m.NSExcluded = &[]string{} if m.IsScalTest { diff --git a/test/e2e/basic/resources-check/namespaces_annotation.go b/test/e2e/basic/resources-check/namespaces_annotation.go index f5e18c46d..c8642c22c 100644 --- a/test/e2e/basic/resources-check/namespaces_annotation.go +++ b/test/e2e/basic/resources-check/namespaces_annotation.go @@ -24,7 +24,6 @@ import ( "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/k8s" ) @@ -41,8 +40,6 @@ func (n *NSAnnotationCase) Init() error { n.NamespacesTotal = 1 n.NSIncluded = &[]string{} - n.VeleroCfg = VeleroCfg - n.Client = *n.VeleroCfg.ClientToInstallVelero for nsNum := 0; nsNum < n.NamespacesTotal; nsNum++ { createNSName := fmt.Sprintf("%s-%00000d", n.CaseBaseName, nsNum) *n.NSIncluded = append(*n.NSIncluded, createNSName) diff --git a/test/e2e/basic/resources-check/rbac.go b/test/e2e/basic/resources-check/rbac.go index 0afe41681..37e2ce5fb 100644 --- a/test/e2e/basic/resources-check/rbac.go +++ b/test/e2e/basic/resources-check/rbac.go @@ -40,7 +40,6 @@ import ( "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/k8s" ) @@ -56,8 +55,6 @@ func (r *RBACCase) Init() error { r.RestoreName = "restore-" + r.CaseBaseName r.NamespacesTotal = 1 r.NSIncluded = &[]string{} - r.VeleroCfg = VeleroCfg - r.Client = *r.VeleroCfg.ClientToInstallVelero for nsNum := 0; nsNum < r.NamespacesTotal; nsNum++ { createNSName := fmt.Sprintf("%s-%00000d", r.CaseBaseName, nsNum) diff --git a/test/e2e/basic/storage-class-changing.go b/test/e2e/basic/storage-class-changing.go index 279f16001..5b35c91d0 100644 --- a/test/e2e/basic/storage-class-changing.go +++ b/test/e2e/basic/storage-class-changing.go @@ -41,8 +41,6 @@ func (s *StorageClasssChanging) Init() error { s.BackupName = "backup-" + s.CaseBaseName s.RestoreName = "restore-" + s.CaseBaseName s.mappedNS = s.namespace + "-mapped" - s.VeleroCfg = VeleroCfg - s.Client = *s.VeleroCfg.ClientToInstallVelero s.TestMsg = &TestMSG{ Desc: "Changing PV/PVC Storage Classes", FailedMSG: "Failed to changing PV/PVC Storage Classes", diff --git a/test/e2e/migration/migration.go b/test/e2e/migration/migration.go index 92b885531..0db2d983c 100644 --- a/test/e2e/migration/migration.go +++ b/test/e2e/migration/migration.go @@ -295,7 +295,7 @@ func MigrationTest(useVolumeSnapshots bool, veleroCLI2Version VeleroCLI2Version) veleroCfg.UseRestic = false if veleroCfg.SnapshotMoveData { veleroCfg.UseNodeAgent = true - // For SnapshotMoveData pipelines, we should use standby clustr setting for Velero installation + // For SnapshotMoveData pipelines, we should use standby cluster setting for Velero installation // In nightly CI, StandbyClusterPlugins is set properly if pipeline is for SnapshotMoveData. veleroCfg.Plugins = veleroCfg.StandbyClusterPlugins veleroCfg.ObjectStoreProvider = veleroCfg.StandbyClusterObjectStoreProvider diff --git a/test/e2e/pv-backup/pv-backup-filter.go b/test/e2e/pv-backup/pv-backup-filter.go index b7d9c2491..07b14d0c1 100644 --- a/test/e2e/pv-backup/pv-backup-filter.go +++ b/test/e2e/pv-backup/pv-backup-filter.go @@ -35,8 +35,6 @@ func (p *PVBackupFiltering) Init() error { p.CaseBaseName = "pv-filter-" + p.UUIDgen p.BackupName = "backup-" + p.CaseBaseName + p.id p.RestoreName = "restore-" + p.CaseBaseName + p.id - p.VeleroCfg = VeleroCfg - p.Client = *p.VeleroCfg.ClientToInstallVelero p.VeleroCfg.UseVolumeSnapshots = false p.VeleroCfg.UseNodeAgent = true p.NSIncluded = &[]string{fmt.Sprintf("%s-%s-%d", p.CaseBaseName, p.id, 1), fmt.Sprintf("%s-%s-%d", p.CaseBaseName, p.id, 2)} diff --git a/test/e2e/resource-filtering/base.go b/test/e2e/resource-filtering/base.go index 28423f1f0..61be331c3 100644 --- a/test/e2e/resource-filtering/base.go +++ b/test/e2e/resource-filtering/base.go @@ -24,7 +24,6 @@ import ( "github.com/pkg/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" ) @@ -46,8 +45,6 @@ func (f *FilteringCase) Init() error { f.replica = int32(2) f.labels = map[string]string{"resourcefiltering": "true"} f.labelSelector = "resourcefiltering" - f.VeleroCfg = VeleroCfg - f.Client = *f.VeleroCfg.ClientToInstallVelero f.NamespacesTotal = 3 f.BackupArgs = []string{ "create", "--namespace", f.VeleroCfg.VeleroNamespace, "backup", f.BackupName, diff --git a/test/e2e/resourcemodifiers/resource_modifiers.go b/test/e2e/resourcemodifiers/resource_modifiers.go index aceb0b113..7f72a9464 100644 --- a/test/e2e/resourcemodifiers/resource_modifiers.go +++ b/test/e2e/resourcemodifiers/resource_modifiers.go @@ -26,7 +26,6 @@ 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/k8s" ) @@ -73,8 +72,6 @@ func (r *ResourceModifiersCase) Init() error { // assign values to the inner variable for specific case r.yamlConfig = yamlData - r.VeleroCfg = VeleroCfg - r.Client = *r.VeleroCfg.ClientToInstallVelero r.VeleroCfg.UseVolumeSnapshots = false r.VeleroCfg.UseNodeAgent = false diff --git a/test/e2e/resourcepolicies/resource_policies.go b/test/e2e/resourcepolicies/resource_policies.go index 684f97714..82265da9e 100644 --- a/test/e2e/resourcepolicies/resource_policies.go +++ b/test/e2e/resourcepolicies/resource_policies.go @@ -76,8 +76,6 @@ func (r *ResourcePoliciesCase) Init() error { // assign values to the inner variable for specific case r.yamlConfig = yamlData - r.VeleroCfg = VeleroCfg - r.Client = *r.VeleroCfg.ClientToInstallVelero r.VeleroCfg.UseVolumeSnapshots = false r.VeleroCfg.UseNodeAgent = true diff --git a/test/e2e/schedule/ordered_resources.go b/test/e2e/schedule/ordered_resources.go index 9d327d00b..4724c7d7c 100644 --- a/test/e2e/schedule/ordered_resources.go +++ b/test/e2e/schedule/ordered_resources.go @@ -30,7 +30,6 @@ import ( kbclient "sigs.k8s.io/controller-runtime/pkg/client" 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/k8s" . "github.com/vmware-tanzu/velero/test/util/velero" @@ -51,8 +50,6 @@ func (o *OrderedResources) Init() error { o.CaseBaseName = "ordered-resources-" + o.UUIDgen o.ScheduleName = "schedule-" + o.CaseBaseName o.Namespace = o.CaseBaseName + "-" + o.UUIDgen - o.VeleroCfg = VeleroCfg - o.Client = *o.VeleroCfg.ClientToInstallVelero o.OrderMap = map[string]string{ "deployments": fmt.Sprintf("deploy-%s", o.CaseBaseName), "secrets": fmt.Sprintf("secret-%s", o.CaseBaseName), diff --git a/test/e2e/schedule/schedule-backup-creation.go b/test/e2e/schedule/schedule-backup-creation.go index 334b2e9b2..fd2c8d2d4 100644 --- a/test/e2e/schedule/schedule-backup-creation.go +++ b/test/e2e/schedule/schedule-backup-creation.go @@ -10,7 +10,6 @@ import ( . "github.com/onsi/ginkgo" . "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/k8s" . "github.com/vmware-tanzu/velero/test/util/velero" @@ -37,9 +36,7 @@ func (n *ScheduleBackupCreation) Init() error { n.TestCase.Init() n.CaseBaseName = "schedule-backup-creation-test" + n.UUIDgen n.ScheduleName = "schedule-" + n.CaseBaseName - n.namespace = n.CaseBaseName - n.VeleroCfg = VeleroCfg - n.Client = *n.VeleroCfg.ClientToInstallVelero + n.namespace = n.GetTestCase().CaseBaseName n.Period = 3 // Unit is minute n.verifyTimes = 5 // More larger verify times more confidence we have podSleepDurationStr := "300s" diff --git a/test/e2e/schedule/schedule.go b/test/e2e/schedule/schedule.go index da8e433ea..db1bc1cad 100644 --- a/test/e2e/schedule/schedule.go +++ b/test/e2e/schedule/schedule.go @@ -10,7 +10,6 @@ import ( . "github.com/onsi/ginkgo" . "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/k8s" . "github.com/vmware-tanzu/velero/test/util/velero" @@ -33,8 +32,6 @@ func (n *ScheduleBackup) Init() error { n.NSIncluded = &[]string{n.CaseBaseName} n.ScheduleName = "schedule-" + n.CaseBaseName n.RestoreName = "restore-" + n.CaseBaseName - n.VeleroCfg = VeleroCfg - n.Client = *n.VeleroCfg.ClientToInstallVelero n.Period = 3 // Unit is minute n.verifyTimes = 5 // More larger verify times more confidence we have n.TestMsg = &TestMSG{ diff --git a/test/e2e/test/test.go b/test/e2e/test/test.go index 57a7bacbc..3eac6213f 100644 --- a/test/e2e/test/test.go +++ b/test/e2e/test/test.go @@ -125,6 +125,8 @@ func TestFuncWithMultiIt(tests []VeleroBackupRestoreTest) func() { func (t *TestCase) Init() error { t.Ctx, t.CtxCancel = context.WithTimeout(context.Background(), 1*time.Hour) t.UUIDgen = t.GenerateUUID() + t.VeleroCfg = VeleroCfg + t.Client = *t.VeleroCfg.ClientToInstallVelero return nil }