Skip to content

[RayService] Add support for multi-app configs #1155

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

Closed
zcin wants to merge 1 commit into from
Closed

[RayService] Add support for multi-app configs #1155

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
96 changes: 96 additions & 0 deletions helm-chart/kuberay-operator/crds/ray.io_rayservices.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12145,6 +12145,102 @@ spec:
- importPath
type: object
serveConfigV2:
properties:
applications:
items:
properties:
deployments:
items:
properties:
autoscaling_config:
properties:
downscale_delay_s:
type: string
initial_replicas:
type: number
look_back_period_s:
type: string
max_replicas:
type: number
metrics_interval_s:
format: int32
type: integer
min_replicas:
type: string
smoothing_factor:
type: string
target_num_ongoing_requests_per_replica:
format: int32
type: integer
upscale_delay_s:
type: string
type: object
graceful_shutdown_timeout_s:
format: int32
type: integer
graceful_shutdown_wait_loop_s:
format: int32
type: integer
health_check_period_s:
format: int32
type: integer
health_check_timeout_s:
format: int32
type: integer
max_concurrent_queries:
format: int32
type: integer
name:
type: string
num_replicas:
format: int32
type: integer
ray_actor_options:
description: RayActorOptionSpec defines the desired
state of RayActor
properties:
accelerator_type:
type: string
memory:
format: int32
type: integer
num_cpus:
type: number
num_gpus:
type: number
object_store_memory:
format: int32
type: integer
resources:
type: string
runtime_env:
type: string
type: object
route_prefix:
type: string
user_config:
type: string
required:
- name
type: object
type: array
import_path:
type: string
name:
type: string
route_prefix:
type: string
runtime_env:
type: string
required:
- import_path
type: object
type: array
http_options:
properties:
port:
type: integer
type: object
type: object
serveService:
description: ServeService is the Kubernetes service for head node
Expand Down
60 changes: 57 additions & 3 deletions ray-operator/apis/ray/v1alpha1/rayservice_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,14 @@ var DeploymentStatusEnum = struct {
type RayServiceSpec struct {
// Important: Run "make" to regenerate code after modifying this file
ServeDeploymentGraphSpec ServeDeploymentGraphSpec `json:"serveConfig,omitempty"`
ServeConfigV2 ServeConfigV2 `json:"serveConfigV2,omitempty"`
ServeConfigV2 ServeConfigV2Spec `json:"serveConfigV2,omitempty"`
RayClusterSpec RayClusterSpec `json:"rayClusterConfig,omitempty"`
ServiceUnhealthySecondThreshold *int32 `json:"serviceUnhealthySecondThreshold,omitempty"`
DeploymentUnhealthySecondThreshold *int32 `json:"deploymentUnhealthySecondThreshold,omitempty"`
// ServeService is the Kubernetes service for head node and worker nodes who have healthy http proxy to serve traffics.
ServeService *v1.Service `json:"serveService,omitempty"`
}

type ServeConfigV2 struct{}

type ServeDeploymentGraphSpec struct {
ImportPath string `json:"importPath"`
RuntimeEnv string `json:"runtimeEnv,omitempty"`
Expand Down Expand Up @@ -94,6 +92,62 @@ type RayActorOptionSpec struct {
AcceleratorType string `json:"acceleratorType,omitempty"`
}

// V2 Specs

type ServeConfigV2Spec struct {
ApplicationSpecs []ServeApplicationV2Spec `json:"applications,omitempty"`
HTTPOptions ServeHTTPOptionsV2Spec `json:"http_options,omitempty"`
}

type ServeHTTPOptionsV2Spec struct {
Port int `json:"port,omitempty"`
}

type ServeApplicationV2Spec struct {
Name string `json:"name,omitempty"`
RoutePrefix string `json:"route_prefix,omitempty"`
ImportPath string `json:"import_path"`
RuntimeEnv string `json:"runtime_env,omitempty"`
DeploymentSpecs []ServeDeploymentV2Spec `json:"deployments,omitempty"`
}

type ServeDeploymentV2Spec struct {
Name string `json:"name"`
NumReplicas *int32 `json:"num_replicas,omitempty"`
RoutePrefix string `json:"route_prefix,omitempty"`
MaxConcurrentQueries *int32 `json:"max_concurrent_queries,omitempty"`
UserConfig string `json:"user_config,omitempty"`
AutoscalingConfig AutoscalingConfigV2Spec `json:"autoscaling_config,omitempty"`
GracefulShutdownWaitLoopS *int32 `json:"graceful_shutdown_wait_loop_s,omitempty"`
GracefulShutdownTimeoutS *int32 `json:"graceful_shutdown_timeout_s,omitempty"`
HealthCheckPeriodS *int32 `json:"health_check_period_s,omitempty"`
HealthCheckTimeoutS *int32 `json:"health_check_timeout_s,omitempty"`
RayActorOptions RayActorOptionV2Spec `json:"ray_actor_options,omitempty"`
}

// RayActorOptionSpec defines the desired state of RayActor
type RayActorOptionV2Spec struct {
RuntimeEnv string `json:"runtime_env,omitempty"`
NumCpus *float64 `json:"num_cpus,omitempty"`
NumGpus *float64 `json:"num_gpus,omitempty"`
Memory *int32 `json:"memory,omitempty"`
ObjectStoreMemory *int32 `json:"object_store_memory,omitempty"`
Resources string `json:"resources,omitempty"`
AcceleratorType string `json:"accelerator_type,omitempty"`
}

type AutoscalingConfigV2Spec struct {
MinReplicas string `json:"min_replicas,omitempty"`
InitialReplicas *float64 `json:"initial_replicas,omitempty"`
MaxReplicas *float64 `json:"max_replicas,omitempty"`
TargetNumOngoingRequestsPerReplica *int32 `json:"target_num_ongoing_requests_per_replica,omitempty"`
MetricsIntervalS *int32 `json:"metrics_interval_s,omitempty"`
LookBackPeriodS string `json:"look_back_period_s,omitempty"`
SmoothingFactor string `json:"smoothing_factor,omitempty"`
DownscaleDelayS string `json:"downscale_delay_s,omitempty"`
UpscaleDelayS string `json:"upscale_delay_s,omitempty"`
}

// RayServiceStatuses defines the observed state of RayService
// +kubebuilder:printcolumn:name="ServiceStatus",type=string,JSONPath=".status.serviceStatus"
type RayServiceStatuses struct {
Expand Down
Loading