Skip to content

Use CreateAdmissionChecksAndWaitForActive. #8068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
Dec 5, 2025
Merged

Use CreateAdmissionChecksAndWaitForActive. #8068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions test/e2e/multikueue/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,8 @@ var _ = ginkgo.Describe("MultiKueue", func() {
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", multiKueueConfig.Name).
Obj()
util.MustCreate(ctx, k8sManagerClient, multiKueueAc)
util.CreateAdmissionChecksAndWaitForActive(ctx, k8sManagerClient, multiKueueAc)

ginkgo.By("wait for check active", func() {
util.ExpectAdmissionChecksToBeActive(ctx, k8sManagerClient, multiKueueAc)
})
managerFlavor = utiltestingapi.MakeResourceFlavor("default").Obj()
util.MustCreate(ctx, k8sManagerClient, managerFlavor)

Expand Down
6 changes: 1 addition & 5 deletions test/e2e/multikueue/tas_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,7 @@ var _ = ginkgo.Describe("MultiKueue with TopologyAwareScheduling", func() {
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", multiKueueConfig.Name).
Obj()
util.MustCreate(ctx, k8sManagerClient, multiKueueAc)

ginkgo.By("wait for check active", func() {
util.ExpectAdmissionChecksToBeActive(ctx, k8sManagerClient, multiKueueAc)
})
util.CreateAdmissionChecksAndWaitForActive(ctx, k8sManagerClient, multiKueueAc)

managerTopology = utiltestingapi.MakeTopology("default").Levels(corev1.LabelHostname).Obj()
util.MustCreate(ctx, k8sManagerClient, managerTopology)
Expand Down
6 changes: 1 addition & 5 deletions test/integration/multikueue/cluster_role_sharing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,7 @@ var _ = ginkgo.Describe("MultiKueue Cluster Role Sharing", ginkgo.Ordered, ginkg
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
Obj()
util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

ginkgo.By("wait for check active", func() {
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
})
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

managerMkCq = utiltestingapi.MakeClusterQueue("q1").
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
Expand Down
16 changes: 4 additions & 12 deletions test/integration/multikueue/dispatcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@ var _ = ginkgo.Describe("MultiKueueDispatcherIncremental", ginkgo.Ordered, ginkg
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
Obj()
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())

util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

managerCq = utiltestingapi.MakeClusterQueue("q1").
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
Expand Down Expand Up @@ -314,9 +312,7 @@ var _ = ginkgo.Describe("MultiKueueDispatcherExternal", ginkgo.Ordered, ginkgo.C
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
Obj()
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())

util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

managerCq = utiltestingapi.MakeClusterQueue("q1").
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
Expand Down Expand Up @@ -559,9 +555,7 @@ var _ = ginkgo.Describe("MultiKueueDispatcherAllAtOnce", ginkgo.Ordered, ginkgo.
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
Obj()
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())

util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

managerCq = utiltestingapi.MakeClusterQueue("q1").
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
Expand Down Expand Up @@ -794,9 +788,7 @@ var _ = ginkgo.Describe("MultiKueueConfig Re-evaluation", ginkgo.Ordered, func()
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
Obj()
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).To(gomega.Succeed())

util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

managerCq = utiltestingapi.MakeClusterQueue("isolated-cq").
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
Expand Down
6 changes: 1 addition & 5 deletions test/integration/multikueue/enabled_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,7 @@ var _ = ginkgo.Describe("MultiKueue when not all integrations are enabled", gink
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
Obj()
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())

ginkgo.By("wait for check active", func() {
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
})
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

managerCq = utiltestingapi.MakeClusterQueue("q1").
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
Expand Down
6 changes: 1 addition & 5 deletions test/integration/multikueue/external_job_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
Obj()
util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

ginkgo.By("wait for check active", func() {
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
})
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

managerCq = utiltestingapi.MakeClusterQueue("q1").
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
Expand Down
6 changes: 1 addition & 5 deletions test/integration/multikueue/jobs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
Obj()
util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

ginkgo.By("wait for check active", func() {
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
})
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

managerCq = utiltestingapi.MakeClusterQueue("q1").
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
Expand Down
6 changes: 1 addition & 5 deletions test/integration/multikueue/no_gc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,7 @@ var _ = ginkgo.Describe("MultiKueue no GC", ginkgo.Ordered, ginkgo.ContinueOnFai
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
Obj()
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())

ginkgo.By("wait for check active", func() {
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
})
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

managerCq = utiltestingapi.MakeClusterQueue("q1").
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
Expand Down
12 changes: 2 additions & 10 deletions test/integration/multikueue/provisioning_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,7 @@ var _ = ginkgo.Describe("MultiKueue with ProvisioningRequest", ginkgo.Ordered, g
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
Obj()
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())

ginkgo.By("wait for multikueue admission check to be active", func() {
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
})
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

managerRf = utiltestingapi.MakeResourceFlavor("manager-rf").NodeLabel("instance-type", "manager-node").Obj()
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerRf)).To(gomega.Succeed())
Expand All @@ -131,11 +127,7 @@ var _ = ginkgo.Describe("MultiKueue with ProvisioningRequest", ginkgo.Ordered, g
ControllerName(kueue.ProvisioningRequestControllerName).
Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", worker1ProvReqConfig.Name).
Obj()
gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1ProvReqAC)).Should(gomega.Succeed())

ginkgo.By("wait for worker provisioning admission check to be active", func() {
util.ExpectAdmissionChecksToBeActive(worker1TestCluster.ctx, worker1TestCluster.client, worker1ProvReqAC)
})
util.CreateAdmissionChecksAndWaitForActive(worker1TestCluster.ctx, worker1TestCluster.client, worker1ProvReqAC)

worker1Rf = utiltestingapi.MakeResourceFlavor("worker-rf").NodeLabel("instance-type", "worker-node").Obj()
gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Rf)).To(gomega.Succeed())
Expand Down
6 changes: 1 addition & 5 deletions test/integration/multikueue/setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Ordered, ginkgo.ContinueOnFailure,
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
Obj()
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())

ginkgo.By("wait for check active", func() {
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
})
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

managerCq = utiltestingapi.MakeClusterQueue("q1").
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
Expand Down
6 changes: 1 addition & 5 deletions test/integration/multikueue/tas/tas_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,7 @@ var _ = ginkgo.Describe("Topology Aware Scheduling", ginkgo.Ordered, func() {
ControllerName(kueue.MultiKueueControllerName).
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
Obj()
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())

ginkgo.By("wait for check active", func() {
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
})
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)

managerTopology = utiltestingapi.MakeDefaultOneLevelTopology("default")
util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, managerTopology)
Expand Down
8 changes: 8 additions & 0 deletions test/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,14 @@ func CreateLocalQueuesAndWaitForActive(ctx context.Context, c client.Client, lqs
ExpectLocalQueuesToBeActive(ctx, c, lqs...)
}

func CreateAdmissionChecksAndWaitForActive(ctx context.Context, c client.Client, acs ...*kueue.AdmissionCheck) {
ginkgo.GinkgoHelper()
for _, ac := range acs {
MustCreate(ctx, c, ac)
}
ExpectAdmissionChecksToBeActive(ctx, c, acs...)
}

func MustHaveOwnerReference(g gomega.Gomega, ownerRefs []metav1.OwnerReference, obj client.Object, scheme *runtime.Scheme) {
hasOwnerRef, err := controllerutil.HasOwnerReference(ownerRefs, obj, scheme)
g.Expect(err).ToNot(gomega.HaveOccurred())
Expand Down