karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <mohamedmohey2352@gmail.com>
This commit is contained in:
Mohamed Awnallah 2024-07-23 17:44:17 +00:00
parent 721495dcf2
commit f71bc13963
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/federatedresourcequota_test.go
View File

@ -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() {

6
test/helper/policy.go
View File

@ -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"),