[Feature] Kuberay RayJob MultiKueue adapter #3892
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| Copyright 2024 The Kubernetes Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package rayjob | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
|
|
||
| rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| "k8s.io/klog/v2" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
|
|
||
| kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1" | ||
| "sigs.k8s.io/kueue/pkg/controller/constants" | ||
| "sigs.k8s.io/kueue/pkg/controller/jobframework" | ||
| "sigs.k8s.io/kueue/pkg/util/api" | ||
| clientutil "sigs.k8s.io/kueue/pkg/util/client" | ||
| ) | ||
|
|
||
| type multikueueAdapter struct{} | ||
|
|
||
| var _ jobframework.MultiKueueAdapter = (*multikueueAdapter)(nil) | ||
|
|
||
| func (b *multikueueAdapter) SyncJob(ctx context.Context, localClient client.Client, remoteClient client.Client, key types.NamespacedName, workloadName, origin string) error { | ||
| log := ctrl.LoggerFrom(ctx) | ||
|
|
||
| localJob := rayv1.RayJob{} | ||
| err := localClient.Get(ctx, key, &localJob) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| remoteJob := rayv1.RayJob{} | ||
| err = remoteClient.Get(ctx, key, &remoteJob) | ||
| if client.IgnoreNotFound(err) != nil { | ||
| return err | ||
| } | ||
|
|
||
| // if the remote exists, just copy the status | ||
| if err == nil { | ||
mszadkow marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if fromObject(&localJob).IsSuspended() { | ||
| // Ensure the job is unsuspended before updating its status; otherwise, it will fail when patching the spec. | ||
| log.V(2).Info("Skipping the sync since the local job is still suspended") | ||
| return nil | ||
| } | ||
| return clientutil.PatchStatus(ctx, localClient, &localJob, func() (bool, error) { | ||
| localJob.Status = remoteJob.Status | ||
| return true, nil | ||
| }) | ||
| } | ||
|
|
||
| remoteJob = rayv1.RayJob{ | ||
| ObjectMeta: api.CloneObjectMetaForCreation(&localJob.ObjectMeta), | ||
| Spec: *localJob.Spec.DeepCopy(), | ||
| } | ||
|
|
||
| // add the prebuilt workload | ||
| if remoteJob.Labels == nil { | ||
| remoteJob.Labels = make(map[string]string, 2) | ||
| } | ||
| remoteJob.Labels[constants.PrebuiltWorkloadLabel] = workloadName | ||
| remoteJob.Labels[kueue.MultiKueueOriginLabel] = origin | ||
|
|
||
| return remoteClient.Create(ctx, &remoteJob) | ||
| } | ||
|
|
||
| func (b *multikueueAdapter) DeleteRemoteObject(ctx context.Context, remoteClient client.Client, key types.NamespacedName) error { | ||
| job := rayv1.RayJob{} | ||
| job.SetName(key.Name) | ||
| job.SetNamespace(key.Namespace) | ||
| return client.IgnoreNotFound(remoteClient.Delete(ctx, &job)) | ||
| } | ||
|
|
||
| func (b *multikueueAdapter) KeepAdmissionCheckPending() bool { | ||
| return false | ||
| } | ||
|
|
||
| func (b *multikueueAdapter) IsJobManagedByKueue(ctx context.Context, c client.Client, key types.NamespacedName) (bool, string, error) { | ||
| return true, "", nil | ||
| } | ||
|
|
||
| func (b *multikueueAdapter) GVK() schema.GroupVersionKind { | ||
| return gvk | ||
| } | ||
|
|
||
| var _ jobframework.MultiKueueWatcher = (*multikueueAdapter)(nil) | ||
|
|
||
| func (*multikueueAdapter) GetEmptyList() client.ObjectList { | ||
| return &rayv1.RayJobList{} | ||
| } | ||
|
|
||
| func (*multikueueAdapter) WorkloadKeyFor(o runtime.Object) (types.NamespacedName, error) { | ||
| job, isJob := o.(*rayv1.RayJob) | ||
| if !isJob { | ||
| return types.NamespacedName{}, errors.New("not a rayjob") | ||
| } | ||
|
|
||
| prebuiltWl, hasPrebuiltWorkload := job.Labels[constants.PrebuiltWorkloadLabel] | ||
| if !hasPrebuiltWorkload { | ||
| return types.NamespacedName{}, fmt.Errorf("no prebuilt workload found for rayjob: %s", klog.KObj(job)) | ||
| } | ||
|
|
||
| return types.NamespacedName{Name: prebuiltWl, Namespace: job.Namespace}, nil | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So far it's the version without managedBy.
We don't have a ray-operator image that supports managedBy, that would have to be a custom one...
latest -> 1.2.2, which is the last release
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, hopefully 1.3 of KubeRay is released before 0.11 of Kueue and the actually released support will rely on managedBy. @andrewsykim do you know the the KubeRay release is planned?