[RayJob] Follow up of RayJob deletion policy PR #2763
Merged
+47
−28
Conversation
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
Signed-off-by: kaihsun <[email protected]>
kevin85421
commented
Jan 17, 2025
| @@ -321,15 +321,15 @@ func TestUpdateRayJobStatus(t *testing.T) { | |||
|
|
|||
| func TestValidateRayJobSpec(t *testing.T) { | |||
| err := validateRayJobSpec(&rayv1.RayJob{}) | |||
| assert.Error(t, err, "The RayJob is invalid because both `RayClusterSpec` and `ClusterSelector` are empty") | |||
There was a problem hiding this comment.
Several subtests don't return the error from the validation rule we want to test, so I use ErrorContains instead.
MortalHappiness
approved these changes
Jan 17, 2025
andrewsykim
requested changes
Jan 17, 2025
| @@ -896,6 +885,10 @@ func validateRayJobSpec(rayJob *rayv1.RayJob) error { | |||
| if rayJob.Spec.Suspend && !rayJob.Spec.ShutdownAfterJobFinishes { | |||
| return fmt.Errorf("a RayJob with shutdownAfterJobFinishes set to false is not allowed to be suspended") | |||
| } | |||
| if rayJob.Spec.Suspend && rayJob.Spec.DeletionPolicy != nil && *rayJob.Spec.DeletionPolicy != rayv1.DeleteClusterDeletionPolicy { | |||
| // This is a restriction for Kueue. | |||
There was a problem hiding this comment.
Is it safe to assume that Kueue is the only consumer of the suspend API?
There was a problem hiding this comment.
Also, Kueue has it's own validation webhook https://github.com/kubernetes-sigs/kueue/blob/main/pkg/controller/jobs/rayjob/rayjob_webhook.go#L93-L136
Putting the validation check there is probably safer
There was a problem hiding this comment.
Putting the validation check there is probably safer
makes sense
Signed-off-by: kaihsun <[email protected]>
andrewsykim
approved these changes
Jan 17, 2025
win5923
pushed a commit
to win5923/kuberay
that referenced
this pull request
Jan 20, 2025
win5923
pushed a commit
to win5923/kuberay
that referenced
this pull request
Jan 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Why are these changes needed?
Related issue number
Checks