diff --git a/docs/reference/api.md b/docs/reference/api.md index f2732b22a22..62fb6db4129 100644 --- a/docs/reference/api.md +++ b/docs/reference/api.md @@ -150,7 +150,7 @@ _Appears in:_ | `headServiceAnnotations` _object (keys:string, values:string)_ | | | | | `enableInTreeAutoscaling` _boolean_ | EnableInTreeAutoscaling indicates whether operator should create in tree autoscaling configs | | | | `gcsFaultToleranceOptions` _[GcsFaultToleranceOptions](#gcsfaulttoleranceoptions)_ | GcsFaultToleranceOptions for enabling GCS FT | | | -| `headGroupSpec` _[HeadGroupSpec](#headgroupspec)_ | INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "make" to regenerate code after modifying this file
HeadGroupSpecs are the spec for the head pod | | | +| `headGroupSpec` _[HeadGroupSpec](#headgroupspec)_ | HeadGroupSpec is the spec for the head pod | | | | `rayVersion` _string_ | RayVersion is used to determine the command for the Kubernetes Job managed by RayJob | | | | `workerGroupSpecs` _[WorkerGroupSpec](#workergroupspec) array_ | WorkerGroupSpecs are the specs for the worker pods | | | @@ -195,7 +195,7 @@ _Appears in:_ | `submitterConfig` _[SubmitterConfig](#submitterconfig)_ | Configurations of submitter k8s job. | | | | `managedBy` _string_ | ManagedBy is an optional configuration for the controller or entity that manages a RayJob.
The value must be either 'ray.io/kuberay-operator' or 'kueue.x-k8s.io/multikueue'.
The kuberay-operator reconciles a RayJob which doesn't have this field at all or
the field value is the reserved string 'ray.io/kuberay-operator',
but delegates reconciling the RayJob with 'kueue.x-k8s.io/multikueue' to the Kueue.
The field is immutable. | | | | `deletionPolicy` _[DeletionPolicy](#deletionpolicy)_ | DeletionPolicy indicates what resources of the RayJob are deleted upon job completion.
Valid values are 'DeleteCluster', 'DeleteWorkers', 'DeleteSelf' or 'DeleteNone'.
If unset, deletion policy is based on 'spec.shutdownAfterJobFinishes'.
This field requires the RayJobDeletionPolicy feature gate to be enabled. | | | -| `entrypoint` _string_ | INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "make" to regenerate code after modifying this file | | | +| `entrypoint` _string_ | Entrypoint represents the command to start execution. | | | | `runtimeEnvYAML` _string_ | RuntimeEnvYAML represents the runtime environment configuration
provided as a multi-line YAML string. | | | | `jobId` _string_ | If jobId is not set, a new jobId will be auto-generated. | | | | `submissionMode` _[JobSubmissionMode](#jobsubmissionmode)_ | SubmissionMode specifies how RayJob submits the Ray job to the RayCluster.
In "K8sJobMode", the KubeRay operator creates a submitter Kubernetes Job to submit the Ray job.
In "HTTPMode", the KubeRay operator sends a request to the RayCluster to create a Ray job.
In "InteractiveMode", the KubeRay operator waits for a user to submit a job to the Ray cluster. | K8sJobMode | | @@ -464,7 +464,7 @@ _Appears in:_ | `autoscalerOptions` _[AutoscalerOptions](#autoscaleroptions)_ | AutoscalerOptions specifies optional configuration for the Ray autoscaler. | | | | `suspend` _boolean_ | Suspend indicates whether a RayCluster should be suspended.
A suspended RayCluster will have head pods and worker pods deleted. | | | | `headServiceAnnotations` _object (keys:string, values:string)_ | | | | -| `headGroupSpec` _[HeadGroupSpec](#headgroupspec)_ | INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "make" to regenerate code after modifying this file
HeadGroupSpecs are the spec for the head pod | | | +| `headGroupSpec` _[HeadGroupSpec](#headgroupspec)_ | HeadGroupSpec is the spec for the head pod | | | | `rayVersion` _string_ | RayVersion is used to determine the command for the Kubernetes Job managed by RayJob | | | | `workerGroupSpecs` _[WorkerGroupSpec](#workergroupspec) array_ | WorkerGroupSpecs are the specs for the worker pods | | | @@ -504,7 +504,7 @@ _Appears in:_ | `metadata` _object (keys:string, values:string)_ | Refer to Kubernetes API documentation for fields of `metadata`. | | | | `rayClusterSpec` _[RayClusterSpec](#rayclusterspec)_ | RayClusterSpec is the cluster template to run the job | | | | `clusterSelector` _object (keys:string, values:string)_ | ClusterSelector is used to select running rayclusters by labels | | | -| `entrypoint` _string_ | INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
Important: Run "make" to regenerate code after modifying this file | | | +| `entrypoint` _string_ | Entrypoint represents the command to start execution. | | | | `runtimeEnvYAML` _string_ | RuntimeEnvYAML represents the runtime environment configuration
provided as a multi-line YAML string. | | | | `jobId` _string_ | If jobId is not set, a new jobId will be auto-generated. | | | | `entrypointResources` _string_ | EntrypointResources specifies the custom resources and quantities to reserve for the
entrypoint command. | | | diff --git a/ray-operator/apis/ray/v1/raycluster_types.go b/ray-operator/apis/ray/v1/raycluster_types.go index c3f086eb61c..51ec18471b5 100644 --- a/ray-operator/apis/ray/v1/raycluster_types.go +++ b/ray-operator/apis/ray/v1/raycluster_types.go @@ -30,9 +30,7 @@ type RayClusterSpec struct { EnableInTreeAutoscaling *bool `json:"enableInTreeAutoscaling,omitempty"` // GcsFaultToleranceOptions for enabling GCS FT GcsFaultToleranceOptions *GcsFaultToleranceOptions `json:"gcsFaultToleranceOptions,omitempty"` - // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster - // Important: Run "make" to regenerate code after modifying this file - // HeadGroupSpecs are the spec for the head pod + // HeadGroupSpec is the spec for the head pod HeadGroupSpec HeadGroupSpec `json:"headGroupSpec"` // RayVersion is used to determine the command for the Kubernetes Job managed by RayJob RayVersion string `json:"rayVersion,omitempty"` diff --git a/ray-operator/apis/ray/v1/rayjob_types.go b/ray-operator/apis/ray/v1/rayjob_types.go index ab95ee8993d..1b2357490d6 100644 --- a/ray-operator/apis/ray/v1/rayjob_types.go +++ b/ray-operator/apis/ray/v1/rayjob_types.go @@ -110,8 +110,7 @@ type RayJobSpec struct { // This field requires the RayJobDeletionPolicy feature gate to be enabled. // +kubebuilder:validation:XValidation:rule="self in ['DeleteCluster', 'DeleteWorkers', 'DeleteSelf', 'DeleteNone']",message="the deletionPolicy field value must be either 'DeleteCluster', 'DeleteWorkers', 'DeleteSelf', or 'DeleteNone'" DeletionPolicy *DeletionPolicy `json:"deletionPolicy,omitempty"` - // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster - // Important: Run "make" to regenerate code after modifying this file + // Entrypoint represents the command to start execution. Entrypoint string `json:"entrypoint,omitempty"` // RuntimeEnvYAML represents the runtime environment configuration // provided as a multi-line YAML string. diff --git a/ray-operator/apis/ray/v1alpha1/raycluster_types.go b/ray-operator/apis/ray/v1alpha1/raycluster_types.go index 3018540c865..acddffcb70d 100644 --- a/ray-operator/apis/ray/v1alpha1/raycluster_types.go +++ b/ray-operator/apis/ray/v1alpha1/raycluster_types.go @@ -19,9 +19,7 @@ type RayClusterSpec struct { // A suspended RayCluster will have head pods and worker pods deleted. Suspend *bool `json:"suspend,omitempty"` HeadServiceAnnotations map[string]string `json:"headServiceAnnotations,omitempty"` - // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster - // Important: Run "make" to regenerate code after modifying this file - // HeadGroupSpecs are the spec for the head pod + // HeadGroupSpec is the spec for the head pod HeadGroupSpec HeadGroupSpec `json:"headGroupSpec"` // RayVersion is used to determine the command for the Kubernetes Job managed by RayJob RayVersion string `json:"rayVersion,omitempty"` diff --git a/ray-operator/apis/ray/v1alpha1/rayjob_types.go b/ray-operator/apis/ray/v1alpha1/rayjob_types.go index 7365728de4a..a351fde92c7 100644 --- a/ray-operator/apis/ray/v1alpha1/rayjob_types.go +++ b/ray-operator/apis/ray/v1alpha1/rayjob_types.go @@ -51,8 +51,7 @@ type RayJobSpec struct { RayClusterSpec *RayClusterSpec `json:"rayClusterSpec,omitempty"` // ClusterSelector is used to select running rayclusters by labels ClusterSelector map[string]string `json:"clusterSelector,omitempty"` - // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster - // Important: Run "make" to regenerate code after modifying this file + // Entrypoint represents the command to start execution. Entrypoint string `json:"entrypoint"` // RuntimeEnvYAML represents the runtime environment configuration // provided as a multi-line YAML string.