[multikueue] Make the MultiKueue adapter part of the jobframework #2373

trasc · 2024-06-06T13:56:45Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

Make the MultiKueue adapter part of the jobframework, and:

Allow all the code relating to a job's integration with Kueue to be kept in one place (pkg/controller/jobs/...).
Make use if the jobframework's integrationManager capabilities to collect available adapter implementations.

Which issue(s) this PR fixes:

Fixes #2350

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

k8s-ci-robot · 2024-06-06T13:56:47Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

trasc · 2024-06-06T13:56:58Z

/test all

netlify · 2024-06-06T13:57:02Z

✅ Deploy Preview for kubernetes-sigs-kueue canceled.

Name	Link
🔨 Latest commit	`d2b0344`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-kueue/deploys/6672b09009a64f0009b183cf

trasc · 2024-06-06T14:01:59Z

/test all

trasc · 2024-06-06T18:21:35Z

/cc @tenzen-y

tenzen-y · 2024-06-07T06:56:56Z

/cc @tenzen-y

ACK

apis/kueue/v1alpha1/multikueue_types.go

mimowo · 2024-06-13T14:26:37Z

/assign

tenzen-y · 2024-06-13T21:00:43Z

/hold
Let's discuss the MultiKueue features in #2349 before moving something.

pkg/controller/jobframework/integrationmanager.go

pkg/controller/jobs/job/job_multikueue_adapter.go

pkg/controller/jobs/jobset/jobset_multikueue_adapter.go

pkg/controller/jobs/job/job_multikueue_adapter_test.go

mimowo · 2024-06-18T08:29:13Z

pkg/controller/jobs/jobset/jobset_multikueue_adapter_test.go

+
+			gotManagersJobSets := &jobsetapi.JobSetList{}
+			if err := managerClient.List(ctx, gotManagersJobSets); err != nil {
+				t.Errorf("unexpected list manager's jobsets error %s", err)


If the List returns an error we can interrupt the test with t.Failure, then we don't need to use `else below.

I prefer to continue and check the worker's list as well.

as in the other comment

pkg/controller/jobs/jobset/jobset_multikueue_adapter_test.go

pkg/util/api/api.go

alculquicondor

I like this overall

/approve
/hold
I'll leave the LGTM to @mimowo

pkg/controller/jobframework/interface.go

alculquicondor · 2024-06-18T21:43:08Z

pkg/controller/jobs/job/job_multikueue_adapter.go

@@ -100,7 +102,7 @@ func (b *batchJobAdapter) SyncJob(ctx context.Context, localClient client.Client
 	return remoteClient.Create(ctx, &remoteJob)
 }

-func (b *batchJobAdapter) DeleteRemoteObject(ctx context.Context, remoteClient client.Client, key types.NamespacedName) error {
+func (b *multikueueAdapter) DeleteRemoteObject(ctx context.Context, remoteClient client.Client, key types.NamespacedName) error {


It doesn't look like this needs to be part of the interface. Maybe the interface only needs to return an empty object (batchv1.Job in this case). And the rest can be implemented by the admission check.

But it can be also left for a follow up.

Let's keep this for a potential follow-up.

(Keeping it as is could be useful if we plan to support composable jobs )

We could also create an utils generic func like:

func DeleteByKey[T client.Object](ctx, client, key ..)

but the added value may not be that big.

alculquicondor · 2024-06-18T21:45:09Z

pkg/controller/jobs/jobset/jobset_multikueue_adapter.go

 )

-type jobsetAdapter struct{}
+type multikueueAdapter struct{}


I agree that the prefix is redundant.

pkg/util/api/api.go

k8s-ci-robot · 2024-06-18T21:48:22Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alculquicondor, trasc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~pkg/controller/OWNERS~~ [alculquicondor]
~~pkg/util/OWNERS~~ [alculquicondor]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

trasc · 2024-06-19T07:37:37Z

/retest

(test infra issue)

mimowo · 2024-06-19T09:03:19Z

I like this overall

/approve /hold I'll leave the LGTM to @mimowo

Cool, just two nits like this: #2373 (comment) and I'm happy to lgtm.
/hold cancel

mimowo · 2024-06-19T10:20:30Z

Thanks!
/lgtm

k8s-ci-robot · 2024-06-19T10:20:36Z

LGTM label has been added.

Git tree hash: c267c010a5fd9c76d750c3a7eb87f5a00392e2cd

tenzen-y

everything looks good to me.
Thank you for driving this refactoring!

…bernetes-sigs#2373) * [multikueue] Make the MultiKueue adapter part of the jobframework * Review Remarks * Review Remarks * Review Remarks

k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jun 6, 2024

k8s-ci-robot requested review from alculquicondor and kerthcet June 6, 2024 13:56

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 6, 2024

k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jun 6, 2024

trasc force-pushed the multikueue-adapter-in-framework branch from 30f9b69 to 91cb893 Compare June 6, 2024 14:01

k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jun 6, 2024

trasc force-pushed the multikueue-adapter-in-framework branch from 91cb893 to 69ad097 Compare June 6, 2024 15:15

trasc changed the title ~~WIP:~~ [multikueue] Make the MultiKueue adapter part of the jobframework Jun 6, 2024

k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jun 6, 2024

trasc marked this pull request as ready for review June 6, 2024 15:19

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 6, 2024

k8s-ci-robot requested a review from mimowo June 6, 2024 15:19

k8s-ci-robot requested a review from tenzen-y June 6, 2024 18:21

tenzen-y reviewed Jun 10, 2024

View reviewed changes

apis/kueue/v1alpha1/multikueue_types.go Outdated Show resolved Hide resolved

trasc force-pushed the multikueue-adapter-in-framework branch from 69ad097 to 51324dc Compare June 11, 2024 10:35

mszadkow mentioned this pull request Jun 12, 2024

[multikueue] add support for custom multikueue controller #2405

Draft

trasc mentioned this pull request Jun 13, 2024

[MultiKueue] Default the managedBy field for batch Jobs managed by MultiKueue #2401

Merged

k8s-ci-robot assigned mimowo Jun 13, 2024

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 13, 2024

mimowo mentioned this pull request Jun 14, 2024

Provide a way to implement a MultiKueue support for the custom Jobs #2349

Open

5 tasks

trasc force-pushed the multikueue-adapter-in-framework branch 3 times, most recently from 80ae069 to f3fb4ca Compare June 18, 2024 07:19

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 18, 2024

[multikueue] Make the MultiKueue adapter part of the jobframework

a9f3211

trasc force-pushed the multikueue-adapter-in-framework branch from f3fb4ca to a9f3211 Compare June 18, 2024 07:58

k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jun 18, 2024

mimowo reviewed Jun 18, 2024

View reviewed changes

trasc mentioned this pull request Jun 18, 2024

[multikueue] KEP add subcomponents and integration details. #2436

Merged

Review Remarks

57bf2fa

alculquicondor reviewed Jun 18, 2024

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 18, 2024

Review Remarks

6c80921

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 19, 2024

Review Remarks

d2b0344

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 19, 2024

k8s-ci-robot merged commit 3f46a78 into kubernetes-sigs:main Jun 19, 2024
16 checks passed

k8s-ci-robot added this to the v0.8 milestone Jun 19, 2024

trasc deleted the multikueue-adapter-in-framework branch June 19, 2024 10:33

tenzen-y reviewed Jun 20, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[multikueue] Make the MultiKueue adapter part of the jobframework #2373

[multikueue] Make the MultiKueue adapter part of the jobframework #2373

trasc commented Jun 6, 2024 •

edited

Loading

k8s-ci-robot commented Jun 6, 2024

trasc commented Jun 6, 2024

netlify bot commented Jun 6, 2024 •

edited

Loading

trasc commented Jun 6, 2024

trasc commented Jun 6, 2024

tenzen-y commented Jun 7, 2024

mimowo commented Jun 13, 2024

tenzen-y commented Jun 13, 2024

mimowo Jun 18, 2024

trasc Jun 18, 2024

mimowo Jun 18, 2024

alculquicondor left a comment

alculquicondor Jun 18, 2024

trasc Jun 19, 2024

alculquicondor Jun 18, 2024

k8s-ci-robot commented Jun 18, 2024

trasc commented Jun 19, 2024

mimowo commented Jun 19, 2024

mimowo commented Jun 19, 2024

k8s-ci-robot commented Jun 19, 2024

tenzen-y left a comment

[multikueue] Make the MultiKueue adapter part of the jobframework #2373

[multikueue] Make the MultiKueue adapter part of the jobframework #2373

Conversation

trasc commented Jun 6, 2024 • edited Loading

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

k8s-ci-robot commented Jun 6, 2024

trasc commented Jun 6, 2024

netlify bot commented Jun 6, 2024 • edited Loading

✅ Deploy Preview for kubernetes-sigs-kueue canceled.

trasc commented Jun 6, 2024

trasc commented Jun 6, 2024

tenzen-y commented Jun 7, 2024

mimowo commented Jun 13, 2024

tenzen-y commented Jun 13, 2024

mimowo Jun 18, 2024

Choose a reason for hiding this comment

trasc Jun 18, 2024

Choose a reason for hiding this comment

mimowo Jun 18, 2024

Choose a reason for hiding this comment

alculquicondor left a comment

Choose a reason for hiding this comment

alculquicondor Jun 18, 2024

Choose a reason for hiding this comment

trasc Jun 19, 2024

Choose a reason for hiding this comment

alculquicondor Jun 18, 2024

Choose a reason for hiding this comment

k8s-ci-robot commented Jun 18, 2024

trasc commented Jun 19, 2024

mimowo commented Jun 19, 2024

mimowo commented Jun 19, 2024

k8s-ci-robot commented Jun 19, 2024

tenzen-y left a comment

Choose a reason for hiding this comment

trasc commented Jun 6, 2024 •

edited

Loading

netlify bot commented Jun 6, 2024 •

edited

Loading