Skip to content

Support custom resource configuration for the submit pod #3690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support custom resource configuration for the submit pod #3690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ray-operator/apis/ray/v1/rayjob_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,15 @@ type SubmitterConfig struct {
// BackoffLimit of the submitter k8s job.
// +optional
BackoffLimit *int32 `json:"backoffLimit,omitempty"`
// +optional
Resources *SubmitterResources `json:"resources,omitempty"`
}

type SubmitterResources struct {
// +optional
Requests *corev1.ResourceList `json:"requests,omitempty"`
// +optional
Limits *corev1.ResourceList `json:"limits,omitempty"`
}

// RayJobSpec defines the desired state of RayJob
Expand Down
19 changes: 19 additions & 0 deletions ray-operator/config/crd/bases/ray.io_rayjobs.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions ray-operator/controllers/ray/common/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ func GetK8sJobCommand(rayJobInstance *rayv1.RayJob) ([]string, error) {
}

// GetDefaultSubmitterTemplate creates a default submitter template for the Ray job.
func GetDefaultSubmitterTemplate(rayClusterInstance *rayv1.RayCluster) corev1.PodTemplateSpec {
return corev1.PodTemplateSpec{
func GetDefaultSubmitterTemplate(rayClusterInstance *rayv1.RayCluster, rayJob *rayv1.RayJob) corev1.PodTemplateSpec {
pod := corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Expand All @@ -146,4 +146,13 @@ func GetDefaultSubmitterTemplate(rayClusterInstance *rayv1.RayCluster) corev1.Po
RestartPolicy: corev1.RestartPolicyNever,
},
}
if rayJob != nil && rayJob.Spec.SubmitterConfig != nil && rayJob.Spec.SubmitterConfig.Resources != nil {
if rayJob.Spec.SubmitterConfig.Resources.Requests != nil {
pod.Spec.Containers[0].Resources.Requests = *rayJob.Spec.SubmitterConfig.Resources.Requests
}
if rayJob.Spec.SubmitterConfig.Resources.Limits != nil {
pod.Spec.Containers[0].Resources.Limits = *rayJob.Spec.SubmitterConfig.Resources.Limits
}
}
return pod
}
2 changes: 1 addition & 1 deletion ray-operator/controllers/ray/rayjob_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ func getSubmitterTemplate(ctx context.Context, rayJobInstance *rayv1.RayJob, ray

// Set the default value for the optional field SubmitterPodTemplate if not provided.
if rayJobInstance.Spec.SubmitterPodTemplate == nil {
submitterTemplate = common.GetDefaultSubmitterTemplate(rayClusterInstance)
submitterTemplate = common.GetDefaultSubmitterTemplate(rayClusterInstance, rayJobInstance)
logger.Info("default submitter template is used")
} else {
submitterTemplate = *rayJobInstance.Spec.SubmitterPodTemplate.DeepCopy()
Expand Down