Skip to content

Commit 33ef84b

Browse files
mbobrovskyimbobrovskyi
authored
Use CreateAdmissionChecksAndWaitForActive. (#8068)
1 parent eb4aa3c commit 33ef84b

File tree

12 files changed

+23
-66
lines changed

12 files changed

+23
-66
lines changed

‎test/e2e/multikueue/e2e_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,8 @@ var _ = ginkgo.Describe("MultiKueue", func() {
110110
ControllerName(kueue.MultiKueueControllerName).
111111
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", multiKueueConfig.Name).
112112
Obj()
113-
util.MustCreate(ctx, k8sManagerClient, multiKueueAc)
113+
util.CreateAdmissionChecksAndWaitForActive(ctx, k8sManagerClient, multiKueueAc)
114114

115-
ginkgo.By("wait for check active", func() {
116-
util.ExpectAdmissionChecksToBeActive(ctx, k8sManagerClient, multiKueueAc)
117-
})
118115
managerFlavor = utiltestingapi.MakeResourceFlavor("default").Obj()
119116
util.MustCreate(ctx, k8sManagerClient, managerFlavor)
120117

‎test/e2e/multikueue/tas_test.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,7 @@ var _ = ginkgo.Describe("MultiKueue with TopologyAwareScheduling", func() {
9292
ControllerName(kueue.MultiKueueControllerName).
9393
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", multiKueueConfig.Name).
9494
Obj()
95-
util.MustCreate(ctx, k8sManagerClient, multiKueueAc)
96-
97-
ginkgo.By("wait for check active", func() {
98-
util.ExpectAdmissionChecksToBeActive(ctx, k8sManagerClient, multiKueueAc)
99-
})
95+
util.CreateAdmissionChecksAndWaitForActive(ctx, k8sManagerClient, multiKueueAc)
10096

10197
managerTopology = utiltestingapi.MakeTopology("default").Levels(corev1.LabelHostname).Obj()
10298
util.MustCreate(ctx, k8sManagerClient, managerTopology)

‎test/integration/multikueue/cluster_role_sharing_test.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,7 @@ var _ = ginkgo.Describe("MultiKueue Cluster Role Sharing", ginkgo.Label("area:mu
136136
ControllerName(kueue.MultiKueueControllerName).
137137
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
138138
Obj()
139-
util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
140-
141-
ginkgo.By("wait for check active", func() {
142-
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
143-
})
139+
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
144140

145141
managerMkCq = utiltestingapi.MakeClusterQueue("q1").
146142
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).

‎test/integration/multikueue/dispatcher_test.go‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,7 @@ var _ = ginkgo.Describe("MultiKueueDispatcherIncremental", ginkgo.Label("area:mu
120120
ControllerName(kueue.MultiKueueControllerName).
121121
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
122122
Obj()
123-
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())
124-
125-
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
123+
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
126124

127125
managerCq = utiltestingapi.MakeClusterQueue("q1").
128126
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
@@ -308,9 +306,7 @@ var _ = ginkgo.Describe("MultiKueueDispatcherExternal", ginkgo.Label("area:multi
308306
ControllerName(kueue.MultiKueueControllerName).
309307
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
310308
Obj()
311-
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())
312-
313-
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
309+
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
314310

315311
managerCq = utiltestingapi.MakeClusterQueue("q1").
316312
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
@@ -547,9 +543,7 @@ var _ = ginkgo.Describe("MultiKueueDispatcherAllAtOnce", ginkgo.Label("area:mult
547543
ControllerName(kueue.MultiKueueControllerName).
548544
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
549545
Obj()
550-
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())
551-
552-
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
546+
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
553547

554548
managerCq = utiltestingapi.MakeClusterQueue("q1").
555549
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).
@@ -776,9 +770,7 @@ var _ = ginkgo.Describe("MultiKueueConfig Re-evaluation", ginkgo.Label("area:mul
776770
ControllerName(kueue.MultiKueueControllerName).
777771
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
778772
Obj()
779-
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).To(gomega.Succeed())
780-
781-
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
773+
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
782774

783775
managerCq = utiltestingapi.MakeClusterQueue("isolated-cq").
784776
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).

‎test/integration/multikueue/enabled_integration_test.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,7 @@ var _ = ginkgo.Describe("MultiKueue when not all integrations are enabled", gink
101101
ControllerName(kueue.MultiKueueControllerName).
102102
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
103103
Obj()
104-
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())
105-
106-
ginkgo.By("wait for check active", func() {
107-
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
108-
})
104+
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
109105

110106
managerCq = utiltestingapi.MakeClusterQueue("q1").
111107
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).

‎test/integration/multikueue/external_job_test.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Label("area:multikueue", "feature:m
190190
ControllerName(kueue.MultiKueueControllerName).
191191
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
192192
Obj()
193-
util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
194-
195-
ginkgo.By("wait for check active", func() {
196-
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
197-
})
193+
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
198194

199195
managerCq = utiltestingapi.MakeClusterQueue("q1").
200196
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).

‎test/integration/multikueue/jobs_test.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Label("area:multikueue", "feature:m
160160
ControllerName(kueue.MultiKueueControllerName).
161161
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
162162
Obj()
163-
util.MustCreate(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
164-
165-
ginkgo.By("wait for check active", func() {
166-
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
167-
})
163+
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
168164

169165
managerCq = utiltestingapi.MakeClusterQueue("q1").
170166
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).

‎test/integration/multikueue/no_gc_test.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,7 @@ var _ = ginkgo.Describe("MultiKueue no GC", ginkgo.Label("area:multikueue", "fea
119119
ControllerName(kueue.MultiKueueControllerName).
120120
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
121121
Obj()
122-
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())
123-
124-
ginkgo.By("wait for check active", func() {
125-
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
126-
})
122+
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
127123

128124
managerCq = utiltestingapi.MakeClusterQueue("q1").
129125
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).

‎test/integration/multikueue/provisioning_test.go‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,7 @@ var _ = ginkgo.Describe("MultiKueue with ProvisioningRequest", ginkgo.Label("are
100100
ControllerName(kueue.MultiKueueControllerName).
101101
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
102102
Obj()
103-
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())
104-
105-
ginkgo.By("wait for multikueue admission check to be active", func() {
106-
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
107-
})
103+
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
108104

109105
managerRf = utiltestingapi.MakeResourceFlavor("manager-rf").NodeLabel("instance-type", "manager-node").Obj()
110106
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, managerRf)).To(gomega.Succeed())
@@ -129,11 +125,7 @@ var _ = ginkgo.Describe("MultiKueue with ProvisioningRequest", ginkgo.Label("are
129125
ControllerName(kueue.ProvisioningRequestControllerName).
130126
Parameters(kueue.GroupVersion.Group, "ProvisioningRequestConfig", worker1ProvReqConfig.Name).
131127
Obj()
132-
gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1ProvReqAC)).Should(gomega.Succeed())
133-
134-
ginkgo.By("wait for worker provisioning admission check to be active", func() {
135-
util.ExpectAdmissionChecksToBeActive(worker1TestCluster.ctx, worker1TestCluster.client, worker1ProvReqAC)
136-
})
128+
util.CreateAdmissionChecksAndWaitForActive(worker1TestCluster.ctx, worker1TestCluster.client, worker1ProvReqAC)
137129

138130
worker1Rf = utiltestingapi.MakeResourceFlavor("worker-rf").NodeLabel("instance-type", "worker-node").Obj()
139131
gomega.Expect(worker1TestCluster.client.Create(worker1TestCluster.ctx, worker1Rf)).To(gomega.Succeed())

‎test/integration/multikueue/setup_test.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,7 @@ var _ = ginkgo.Describe("MultiKueue", ginkgo.Label("area:multikueue", "feature:m
120120
ControllerName(kueue.MultiKueueControllerName).
121121
Parameters(kueue.GroupVersion.Group, "MultiKueueConfig", managerMultiKueueConfig.Name).
122122
Obj()
123-
gomega.Expect(managerTestCluster.client.Create(managerTestCluster.ctx, multiKueueAC)).Should(gomega.Succeed())
124-
125-
ginkgo.By("wait for check active", func() {
126-
util.ExpectAdmissionChecksToBeActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
127-
})
123+
util.CreateAdmissionChecksAndWaitForActive(managerTestCluster.ctx, managerTestCluster.client, multiKueueAC)
128124

129125
managerCq = utiltestingapi.MakeClusterQueue("q1").
130126
AdmissionChecks(kueue.AdmissionCheckReference(multiKueueAC.Name)).

0 commit comments

Comments
 (0)