[E2E] [RayCronJob] add e2e test for suspend behavior #4349
Conversation
This file contains hidden or 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
…guration Signed-off-by: AndySung320 <[email protected]>
Signed-off-by: AndySung320 <[email protected]>
AndySung320
requested review from
andrewsykim,
kevin85421 and
rueian
as code owners
seanlaii
reviewed
Jan 6, 2026
| //+kubebuilder:printcolumn:name="age",type="date",JSONPath=".metadata.creationTimestamp",priority=0 | ||
| //+kubebuilder:printcolumn:name="suspend",type=boolean,JSONPath=".spec.suspend",priority=0 | ||
|
|
||
| // +genclient |
Contributor
There was a problem hiding this comment.
Good catch!
Maybe we can also add the following annotations as well:
// +kubebuilder:storageversion
// +kubebuilder:resource:categories=all
| g.Expect(err).NotTo(HaveOccurred()) | ||
| ownerUID := rcj.UID | ||
|
|
||
| // No RayJob should be created |
Contributor
There was a problem hiding this comment.
nit:
Suggested change
| // No RayJob should be created | |
| // No RayJob should be created | |
| LogWithTimestamp(test.T(), "Waiting to ensure no RayJobs are created while suspended") |
| return n | ||
| }, 130*time.Second, 5*time.Second).Should(Equal(0)) | ||
|
|
||
| // Resume |
Contributor
There was a problem hiding this comment.
nit:
Suggested change
| // Resume | |
| LogWithTimestamp(test.T(), "Resuming RayCronJob %s/%s", rayCronJob.Namespace, rayCronJob.Name) |
Comment on lines
+89
to
+92
| if err != nil { | ||
| return -1 | ||
| } | ||
| return n |
Contributor
There was a problem hiding this comment.
To preserve error:
Suggested change
| if err != nil { | |
| return -1 | |
| } | |
| return n | |
| g.Expect(err).NotTo(HaveOccurred()) | |
| return n |
|
|
||
| // Spec.suspend should be false | ||
| g.Eventually(func() bool { | ||
| rcj, err := test.Client().Ray().RayV1().RayCronJobs(namespace.Name).Get(test.Ctx(), rayCronJob.Name, metav1.GetOptions{}) |
Contributor
There was a problem hiding this comment.
Maybe we can replace this with a util function similar to GetRayJob.
Member
|
cursor review |
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
Member
Future-Outlier
left a comment
Future-Outlier
left a comment
There was a problem hiding this comment.
cc @machichima @CheyuWu @justinyeh1995 @fscnick to take a look, thank you!
Future-Outlier
moved this from can be merged
to Todo
in @Future-Outlier's kuberay project
Comment on lines
+20
to
+54
| func rayCronJobACTemplate(name, namespace, schedule string) *rayv1ac.RayCronJobApplyConfiguration { | ||
| return rayv1ac.RayCronJob(name, namespace). | ||
| WithSpec( | ||
| rayv1ac.RayCronJobSpec(). | ||
| WithSchedule(schedule). | ||
| WithJobTemplate( | ||
| rayv1ac.RayJobSpec(). | ||
| WithEntrypoint("sleep 1"). | ||
| WithRayClusterSpec( | ||
| rayv1ac.RayClusterSpec(). | ||
| WithHeadGroupSpec( | ||
| rayv1ac.HeadGroupSpec(). | ||
| WithTemplate( | ||
| corev1ac.PodTemplateSpec(). | ||
| WithSpec( | ||
| corev1ac.PodSpec(). | ||
| WithContainers( | ||
| corev1ac.Container(). | ||
| WithName("ray-head"). | ||
| WithImage(GetRayImage()). | ||
| WithResources( | ||
| corev1ac.ResourceRequirements(). | ||
| WithRequests(corev1.ResourceList{ | ||
| corev1.ResourceCPU: resource.MustParse("500m"), | ||
| corev1.ResourceMemory: resource.MustParse("500Mi"), | ||
| }), | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ) | ||
| } |
Contributor
There was a problem hiding this comment.
nit: for readability, would it make sense to construct it bottom-up using intermediate variables?
For example
func rayCronJobACTemplate(name, namespace, schedule string) *rayv1ac.RayCronJobApplyConfiguration {
headContainer := corev1ac.Container().
WithName("ray-head").
WithImage(GetRayImage()).
WithResources(
corev1ac.ResourceRequirements().
WithRequests(corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("500m"),
corev1.ResourceMemory: resource.MustParse("500Mi"),
}),
)
podTmpl := corev1ac.PodTemplateSpec().
WithSpec(corev1ac.PodSpec().WithContainers(headContainer))
cluster := ...
job := ...
spec := ...
return rayv1ac.RayCronJob(name, namespace).WithSpec(spec)
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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?
This PR adds an e2e test covering RayCronJob suspend/resume behavior:
spec.suspend=true, the RayCronJob controller should not create any new RayJobs even after the scheduled time passes.spec.suspend=false, the controller should resume scheduling and start creating RayJobs again.To run this e2e test in CI, we also enable the RayCronJob feature gate in the test/CI-only operator overrides (Helm values override and kustomize test override).
Note: RayCronJob previously did not have
// +genclient, so the typed client/applyconfiguration for RayCronJob was not generated. The PR adds+genclientand commits the resulting regenerated clientset/applyconfiguration/informer/lister code so the test can compile and run consistently.Related issue number
Closes #4323
Checks