Skip to content

Commit

Permalink
updating integration tests to pass new jobframework option
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgrove-oss
dgrove-oss committed Dec 4, 2024
1 parent f3bafd7 commit 11e7309
Show file tree
Hide file tree
Showing 14 changed files with 109 additions and 72 deletions.
2 changes: 2 additions & 0 deletions test/integration/controller/jobs/job/job_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
apimeta "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -62,6 +63,7 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
ginkgo.BeforeAll(func() {
fwk.StartManager(ctx, cfg, managerSetup(
jobframework.WithManageJobsWithoutQueueName(true),
jobframework.WithManagedJobsNamespaceSelector(labels.Everything()),
jobframework.WithLabelKeysToCopy([]string{"toCopyKey"}),
))
})
Expand Down
3 changes: 2 additions & 1 deletion test/integration/controller/jobs/jobset/jobset_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
apimeta "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -56,7 +57,7 @@ const (

var _ = ginkgo.Describe("JobSet controller", ginkgo.Ordered, ginkgo.ContinueOnFailure, ginkgo.ContinueOnFailure, func() {
ginkgo.BeforeAll(func() {
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true)))
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true), jobframework.WithManagedJobsNamespaceSelector(labels.Everything())))
})
ginkgo.AfterAll(func() {
fwk.StopManager(ctx)
Expand Down
3 changes: 2 additions & 1 deletion test/integration/controller/jobs/mpijob/mpijob_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
apimeta "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -57,7 +58,7 @@ const (

var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailure, ginkgo.ContinueOnFailure, func() {
ginkgo.BeforeAll(func() {
fwk.StartManager(ctx, cfg, managerSetup(false, jobframework.WithManageJobsWithoutQueueName(true)))
fwk.StartManager(ctx, cfg, managerSetup(false, jobframework.WithManageJobsWithoutQueueName(true), jobframework.WithManagedJobsNamespaceSelector(labels.Everything())))
})
ginkgo.AfterAll(func() {
fwk.StopManager(ctx)
Expand Down
3 changes: 2 additions & 1 deletion test/integration/controller/jobs/mxjob/mxjob_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"

Expand Down Expand Up @@ -53,7 +54,7 @@ const (

var _ = ginkgo.Describe("Job controller", framework.RedundantSpec, ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
ginkgo.BeforeAll(func() {
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true)))
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true), jobframework.WithManagedJobsNamespaceSelector(labels.Everything())))
})

ginkgo.AfterAll(func() {
Expand Down
3 changes: 2 additions & 1 deletion test/integration/controller/jobs/paddlejob/paddlejob_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"

Expand Down Expand Up @@ -54,7 +55,7 @@ const (

var _ = ginkgo.Describe("Job controller", framework.RedundantSpec, ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
ginkgo.BeforeAll(func() {
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true)))
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true), jobframework.WithManagedJobsNamespaceSelector(labels.Everything())))
})

ginkgo.AfterAll(func() {
Expand Down
98 changes: 56 additions & 42 deletions test/integration/controller/jobs/pod/pod_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,28 @@ var _ = ginkgo.Describe("Pod controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
ResourceGroup(
*testing.MakeFlavorQuotas(defaultFlavor.Name).Resource(corev1.ResourceCPU, "1").Obj(),
).Obj()

nsSelector := &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: "kubernetes.io/metadata.name",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{"kube-system", "kueue-system"},
},
},
}
mjnsSelector, err := metav1.LabelSelectorAsSelector(nsSelector)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
ginkgo.BeforeAll(func() {
fwk.StartManager(ctx, cfg, managerSetup(
false,
false,
nil,
jobframework.WithManageJobsWithoutQueueName(false),
jobframework.WithManagedJobsNamespaceSelector(mjnsSelector),
jobframework.WithKubeServerVersion(serverVersionFetcher),
jobframework.WithIntegrationOptions(corev1.SchemeGroupVersion.WithKind("Pod").String(), &configapi.PodIntegrationOptions{
PodSelector: &metav1.LabelSelector{},
NamespaceSelector: &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: "kubernetes.io/metadata.name",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{"kube-system", "kueue-system"},
},
},
},
PodSelector: &metav1.LabelSelector{},
NamespaceSelector: nsSelector,
}),
jobframework.WithLabelKeysToCopy([]string{"toCopyKey"}),
))
Expand Down Expand Up @@ -1418,22 +1421,26 @@ var _ = ginkgo.Describe("Pod controller interacting with scheduler", ginkgo.Orde

ginkgo.BeforeAll(func() {
configuration := configapi.Configuration{Resources: &configapi.Resources{ExcludeResourcePrefixes: []string{"networking.example.com/"}}}
nsSelector := &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: "kubernetes.io/metadata.name",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{"kube-system", "kueue-system"},
},
},
}
mjnsSelector, err := metav1.LabelSelectorAsSelector(nsSelector)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
fwk.StartManager(ctx, cfg, managerSetup(
false,
true,
&configuration,
jobframework.WithManageJobsWithoutQueueName(false),
jobframework.WithManagedJobsNamespaceSelector(mjnsSelector),
jobframework.WithIntegrationOptions(corev1.SchemeGroupVersion.WithKind("Pod").String(), &configapi.PodIntegrationOptions{
PodSelector: &metav1.LabelSelector{},
NamespaceSelector: &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: "kubernetes.io/metadata.name",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{"kube-system", "kueue-system"},
},
},
},
PodSelector: &metav1.LabelSelector{},
NamespaceSelector: nsSelector,
}),
))
spotUntaintedFlavor = testing.MakeResourceFlavor("spot-untainted").NodeLabel(instanceKey, "spot-untainted").Obj()
Expand Down Expand Up @@ -1675,21 +1682,25 @@ var _ = ginkgo.Describe("Pod controller interacting with Workload controller whe
BackoffBaseSeconds: ptr.To[int32](1),
},
}
nsSelector := &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: "kubernetes.io/metadata.name",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{"kube-system", "kueue-system"},
},
},
}
mjnsSelector, err := metav1.LabelSelectorAsSelector(nsSelector)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
fwk.StartManager(ctx, cfg, managerSetup(
false,
false,
&configapi.Configuration{WaitForPodsReady: waitForPodsReady},
jobframework.WithManagedJobsNamespaceSelector(mjnsSelector),
jobframework.WithIntegrationOptions(corev1.SchemeGroupVersion.WithKind("Pod").String(), &configapi.PodIntegrationOptions{
PodSelector: &metav1.LabelSelector{},
NamespaceSelector: &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: "kubernetes.io/metadata.name",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{"kube-system", "kueue-system"},
},
},
},
PodSelector: &metav1.LabelSelector{},
NamespaceSelector: nsSelector,
}),
))
})
Expand Down Expand Up @@ -1870,20 +1881,23 @@ var _ = ginkgo.Describe("Pod controller when TopologyAwareScheduling enabled", g
clusterQueue *kueue.ClusterQueue
localQueue *kueue.LocalQueue
)

nsSelector := &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: "kubernetes.io/metadata.name",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{"kube-system", "kueue-system"},
},
},
}
mjnsSelector, err := metav1.LabelSelectorAsSelector(nsSelector)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
ginkgo.BeforeAll(func() {
fwk.StartManager(ctx, cfg, managerSetup(true, true, nil,
jobframework.WithManagedJobsNamespaceSelector(mjnsSelector),
jobframework.WithIntegrationOptions(corev1.SchemeGroupVersion.WithKind("Pod").String(), &configapi.PodIntegrationOptions{
PodSelector: &metav1.LabelSelector{},
NamespaceSelector: &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{
Key: "kubernetes.io/metadata.name",
Operator: metav1.LabelSelectorOpNotIn,
Values: []string{"kube-system", "kueue-system"},
},
},
},
PodSelector: &metav1.LabelSelector{},
NamespaceSelector: nsSelector,
}),
))
})
Expand Down
3 changes: 2 additions & 1 deletion test/integration/controller/jobs/pytorchjob/pytorchjob_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -56,7 +57,7 @@ const (

var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
ginkgo.BeforeAll(func() {
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true)))
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true), jobframework.WithManagedJobsNamespaceSelector(labels.Everything())))
})

ginkgo.AfterAll(func() {
Expand Down
3 changes: 2 additions & 1 deletion test/integration/controller/jobs/raycluster/raycluster_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
schedulingv1 "k8s.io/api/scheduling/v1"
apimeta "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -53,7 +54,7 @@ const (

var _ = ginkgo.Describe("RayCluster controller", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
ginkgo.BeforeAll(func() {
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true)))
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true), jobframework.WithManagedJobsNamespaceSelector(labels.Everything())))
})
ginkgo.AfterAll(func() {
fwk.StopManager(ctx)
Expand Down
3 changes: 2 additions & 1 deletion test/integration/controller/jobs/rayjob/rayjob_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
schedulingv1 "k8s.io/api/scheduling/v1"
apimeta "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -60,7 +61,7 @@ func setInitStatus(name, namespace string) {

var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
ginkgo.BeforeAll(func() {
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true)))
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true), jobframework.WithManagedJobsNamespaceSelector(labels.Everything())))
})

ginkgo.AfterAll(func() {
Expand Down
3 changes: 2 additions & 1 deletion test/integration/controller/jobs/tfjob/tfjob_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"

Expand Down Expand Up @@ -54,7 +55,7 @@ const (

var _ = ginkgo.Describe("Job controller", framework.RedundantSpec, ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
ginkgo.BeforeAll(func() {
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true)))
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true), jobframework.WithManagedJobsNamespaceSelector(labels.Everything())))
})

ginkgo.AfterAll(func() {
Expand Down
3 changes: 2 additions & 1 deletion test/integration/controller/jobs/xgboostjob/xgboostjob_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"

Expand Down Expand Up @@ -54,7 +55,7 @@ const (

var _ = ginkgo.Describe("Job controller", framework.RedundantSpec, ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
ginkgo.BeforeAll(func() {
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true)))
fwk.StartManager(ctx, cfg, managerSetup(jobframework.WithManageJobsWithoutQueueName(true), jobframework.WithManagedJobsNamespaceSelector(labels.Everything())))
})

ginkgo.AfterAll(func() {
Expand Down
2 changes: 2 additions & 0 deletions test/integration/webhook/jobs/job_webhook_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/discovery"
"k8s.io/utils/ptr"
Expand All @@ -47,6 +48,7 @@ var _ = ginkgo.Describe("Job Webhook With manageJobsWithoutQueueName enabled", g
fwk.StartManager(ctx, cfg, managerSetup(
job.SetupWebhook,
jobframework.WithManageJobsWithoutQueueName(true),
jobframework.WithManagedJobsNamespaceSelector(labels.Everything()),
jobframework.WithKubeServerVersion(serverVersionFetcher),
))
})
Expand Down
Loading

0 comments on commit 11e7309

Please sign in to comment.