Skip to content
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

Jump to bottom

[0.3.0 pick][rayservice] Fix config names to match serve config format directly #477

Merged
merged 1 commit into from
Aug 16, 2022
Merged

[0.3.0 pick][rayservice] Fix config names to match serve config format directly #477

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
4 changes: 2 additions & 2 deletions docs/guidance/rayservice.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Then you can open your web browser with the url localhost:8265 to see your Ray d

### Update Ray Serve Deployment Graph

You can update the `serveDeploymentGraphConfig` in your RayService config file.
You can update the `serveConfig` in your RayService config file.
For example, if you update the mango price to 4 in [ray_v1alpha1_rayservice.yaml](https://github.com/ray-project/kuberay/blob/master/ray-operator/config/samples/ray_v1alpha1_rayservice.yaml).
```shell
- name: MangoStand
Expand Down Expand Up @@ -226,4 +226,4 @@ Table (group by func_name):

### Delete the operator

`$ kubectl delete -k "github.com/ray-project/kuberay/ray-operator/config/default"`
`$ kubectl delete -k "github.com/ray-project/kuberay/ray-operator/config/default"`
4 changes: 2 additions & 2 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 @@ -11471,15 +11471,15 @@ spec:
required:
- headGroupSpec
type: object
serveDeploymentGraphConfig:
serveConfig:
description: 'Important: Run "make" to regenerate code after modifying
this file'
properties:
importPath:
type: string
runtimeEnv:
type: string
serveConfigs:
deployments:
items:
description: ServeConfigSpec defines the desired state of RayService
Reference to http://rayserve.org
Expand Down
4 changes: 2 additions & 2 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 @@ -24,7 +24,7 @@ const (
// RayServiceSpec defines the desired state of RayService
type RayServiceSpec struct {
// Important: Run "make" to regenerate code after modifying this file
ServeDeploymentGraphSpec ServeDeploymentGraphSpec `json:"serveDeploymentGraphConfig,omitempty"`
ServeDeploymentGraphSpec ServeDeploymentGraphSpec `json:"serveConfig,omitempty"`
RayClusterSpec RayClusterSpec `json:"rayClusterConfig,omitempty"`
ServiceUnhealthySecondThreshold *int32 `json:"serviceUnhealthySecondThreshold,omitempty"`
DeploymentUnhealthySecondThreshold *int32 `json:"deploymentUnhealthySecondThreshold,omitempty"`
Expand All @@ -33,7 +33,7 @@ type RayServiceSpec struct {
type ServeDeploymentGraphSpec struct {
ImportPath string `json:"importPath"`
RuntimeEnv string `json:"runtimeEnv,omitempty"`
ServeConfigSpecs []ServeConfigSpec `json:"serveConfigs,omitempty"`
ServeConfigSpecs []ServeConfigSpec `json:"deployments,omitempty"`
}

// ServeConfigSpec defines the desired state of RayService
Expand Down
4 changes: 2 additions & 2 deletions ray-operator/apis/ray/v1alpha1/rayservice_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,10 @@ var expected = `{
"creationTimestamp":null
},
"spec":{
"serveDeploymentGraphConfig":{
"serveConfig":{
"importPath":"fruit.deployment_graph",
"runtimeEnv":"working_dir:\n - \"https://github.com/ray-project/test_dag/archive/c620251044717ace0a4c19d766d43c5099af8a77.zip\"",
"serveConfigs":[
"deployments":[
{
"name":"MangoStand",
"numReplicas":1,
Expand Down
4 changes: 2 additions & 2 deletions ray-operator/config/crd/bases/ray.io_rayservices.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11610,15 +11610,15 @@ spec:
required:
- headGroupSpec
type: object
serveDeploymentGraphConfig:
serveConfig:
description: 'Important: Run "make" to regenerate code after modifying
this file'
properties:
importPath:
type: string
runtimeEnv:
type: string
serveConfigs:
deployments:
items:
description: ServeConfigSpec defines the desired state of RayService
Reference to http://rayserve.org
Expand Down
4 changes: 2 additions & 2 deletions ray-operator/config/samples/ray_v1alpha1_rayservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ metadata:
spec:
serviceUnhealthySecondThreshold: 300 # Config for the health check threshold for service. Default value is 60.
deploymentUnhealthySecondThreshold: 300 # Config for the health check threshold for deployments. Default value is 60.
serveDeploymentGraphConfig:
serveConfig:
importPath: fruit.deployment_graph
runtimeEnv: |
working_dir: "https://github.com/ray-project/test_dag/archive/c620251044717ace0a4c19d766d43c5099af8a77.zip"
serveConfigs:
deployments:
- name: MangoStand
numReplicas: 1
userConfig: |
Expand Down
4 changes: 2 additions & 2 deletions tests/config/ray-service-cluster-update.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
spec:
serviceUnhealthySecondThreshold: 300
deploymentUnhealthySecondThreshold: 300
serveDeploymentGraphConfig:
serveConfig:
importPath: fruit.deployment_graph
runtimeEnv: |
working_dir: "https://github.com/ray-project/test_dag/archive/c620251044717ace0a4c19d766d43c5099af8a77.zip"
serveConfigs:
deployments:
- name: MangoStand
numReplicas: 1
userConfig: |
Expand Down
4 changes: 2 additions & 2 deletions tests/config/ray-service-serve-update.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
spec:
serviceUnhealthySecondThreshold: 300
deploymentUnhealthySecondThreshold: 300
serveDeploymentGraphConfig:
serveConfig:
importPath: fruit.deployment_graph
runtimeEnv: |
working_dir: "https://github.com/ray-project/test_dag/archive/c620251044717ace0a4c19d766d43c5099af8a77.zip"
serveConfigs:
deployments:
- name: MangoStand
numReplicas: 1
userConfig: |
Expand Down
4 changes: 2 additions & 2 deletions tests/config/ray-service.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
spec:
serviceUnhealthySecondThreshold: 300
deploymentUnhealthySecondThreshold: 300
serveDeploymentGraphConfig:
serveConfig:
importPath: fruit.deployment_graph
runtimeEnv: |
working_dir: "https://github.com/ray-project/test_dag/archive/c620251044717ace0a4c19d766d43c5099af8a77.zip"
serveConfigs:
deployments:
- name: MangoStand
numReplicas: 1
userConfig: |
Expand Down