From f71bc1396371e676925436a3fab1293bda97ab1a Mon Sep 17 00:00:00 2001 From: Mohamed Awnallah Date: Tue, 23 Jul 2024 17:44:17 +0000 Subject: [PATCH] test: unify access to cluster members In this commit, we unify access to cluster members in `test/helper/NewFederatedResourceQuota()` by passing `clusterNames` as an input parameter. This commit is also a follow-up of this PR #5226. Signed-off-by: Mohamed Awnallah --- test/e2e/federatedresourcequota_test.go | 4 ++-- test/helper/policy.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/federatedresourcequota_test.go b/test/e2e/federatedresourcequota_test.go index 86b46c396..3878dac75 100644 --- a/test/e2e/federatedresourcequota_test.go +++ b/test/e2e/federatedresourcequota_test.go @@ -46,7 +46,7 @@ var _ = framework.SerialDescribe("FederatedResourceQuota auto-provision testing" ginkgo.BeforeEach(func() { frqNamespace = testNamespace frqName = federatedResourceQuotaPrefix + rand.String(RandomStrLength) - federatedResourceQuota = helper.NewFederatedResourceQuota(frqNamespace, frqName) + federatedResourceQuota = helper.NewFederatedResourceQuota(frqNamespace, frqName, framework.ClusterNames()) defaultConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag().WithDiscoveryBurst(300).WithDiscoveryQPS(50.0) defaultConfigFlags.Context = &karmadaContext @@ -163,7 +163,7 @@ var _ = framework.SerialDescribe("[FederatedResourceQuota] status collection tes ginkgo.BeforeEach(func() { frqNamespace = testNamespace frqName = federatedResourceQuotaPrefix + rand.String(RandomStrLength) - federatedResourceQuota = helper.NewFederatedResourceQuota(frqNamespace, frqName) + federatedResourceQuota = helper.NewFederatedResourceQuota(frqNamespace, frqName, framework.ClusterNames()) }) ginkgo.Context("collect federatedResourceQuota status", func() { diff --git a/test/helper/policy.go b/test/helper/policy.go index 5e56901c3..2a1b5a66a 100644 --- a/test/helper/policy.go +++ b/test/helper/policy.go @@ -161,7 +161,7 @@ func NewClusterOverridePolicyByOverrideRules(policyName string, rsSelectors []po } // NewFederatedResourceQuota will build a demo FederatedResourceQuota object. -func NewFederatedResourceQuota(ns, name string) *policyv1alpha1.FederatedResourceQuota { +func NewFederatedResourceQuota(ns, name string, clusterNames []string) *policyv1alpha1.FederatedResourceQuota { return &policyv1alpha1.FederatedResourceQuota{ ObjectMeta: metav1.ObjectMeta{ Namespace: ns, @@ -174,14 +174,14 @@ func NewFederatedResourceQuota(ns, name string) *policyv1alpha1.FederatedResourc }, StaticAssignments: []policyv1alpha1.StaticClusterAssignment{ { - ClusterName: "member1", + ClusterName: clusterNames[0], Hard: map[corev1.ResourceName]resource.Quantity{ "cpu": resource.MustParse("1"), "memory": resource.MustParse("2Gi"), }, }, { - ClusterName: "member2", + ClusterName: clusterNames[1], Hard: map[corev1.ResourceName]resource.Quantity{ "cpu": resource.MustParse("1"), "memory": resource.MustParse("2Gi"),