Skip to content

Commit

Permalink
[Post Ray 2.3 Release] Update Ray versions to Ray 2.3.0
Browse files Browse the repository at this point in the history
Signed-off-by: Cade Daniel <[email protected]>
  • Loading branch information
cadedaniel committed Feb 23, 2023
1 parent 5876b1d commit 08572b4
Show file tree
Hide file tree
Showing 29 changed files with 95 additions and 75 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/test-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,26 @@ jobs:
with:
ray_version: 2.2.0

test-compatibility-2_3_0:
needs:
- build_operator
- build_apiserver
- lint
runs-on: ubuntu-latest
name: Compatibility Test - 2.3.0
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2
with:
# When checking out the repository that
# triggered a workflow, this defaults to the reference or SHA for that event.
# Default value should work for both pull_request and merge(push) event.
ref: ${{github.event.pull_request.head.sha}}

- uses: ./.github/workflows/actions/compatibility
with:
ray_version: 2.3.0

test-compatibility-nightly:
needs:
- build_operator
Expand Down
4 changes: 2 additions & 2 deletions apiserver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ curl -X POST 'localhost:31888/apis/v1alpha2/namespaces/ray-system/services' \
"clusterSpec": {
"headGroupSpec": {
"computeTemplate": "default-template",
"image": "rayproject/ray:2.2.0",
"image": "rayproject/ray:2.3.0",
"serviceType": "NodePort",
"rayStartParams": {
"dashboard-host": "0.0.0.0",
Expand All @@ -152,7 +152,7 @@ curl -X POST 'localhost:31888/apis/v1alpha2/namespaces/ray-system/services' \
{
"groupName": "small-wg",
"computeTemplate": "default-template",
"image": "rayproject/ray:2.2.0",
"image": "rayproject/ray:2.3.0",
"replicas": 1,
"minReplicas": 0,
"maxReplicas": 5,
Expand Down
2 changes: 1 addition & 1 deletion docs/guidance/pod-command.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Currently, for timing (1), we can set the container's `Command` and `Args` in Ra
spec:
containers:
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
resources:
...
ports:
Expand Down
16 changes: 8 additions & 8 deletions docs/guidance/volcano-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ metadata:
ray.io/scheduler-name: volcano
volcano.sh/queue-name: kuberay-test-queue
spec:
rayVersion: '2.2.0'
rayVersion: '2.3.0'
headGroupSpec:
serviceType: ClusterIP
rayStartParams:
Expand All @@ -52,7 +52,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
resources:
limits:
cpu: "1"
Expand Down Expand Up @@ -106,7 +106,7 @@ metadata:
ray.io/scheduler-name: volcano
volcano.sh/queue-name: kuberay-test-queue
spec:
rayVersion: '2.2.0'
rayVersion: '2.3.0'
headGroupSpec:
serviceType: ClusterIP
rayStartParams:
Expand All @@ -116,7 +116,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
resources:
limits:
cpu: "1"
Expand All @@ -135,7 +135,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
resources:
limits:
cpu: "1"
Expand Down Expand Up @@ -220,7 +220,7 @@ metadata:
ray.io/scheduler-name: volcano
volcano.sh/queue-name: kuberay-test-queue
spec:
rayVersion: '2.2.0'
rayVersion: '2.3.0'
headGroupSpec:
serviceType: ClusterIP
rayStartParams:
Expand All @@ -230,7 +230,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
resources:
limits:
cpu: "1"
Expand All @@ -249,7 +249,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
resources:
limits:
cpu: "1"
Expand Down
6 changes: 3 additions & 3 deletions ray-operator/DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ These tests operate small Ray clusters running within a [kind](https://kind.sigs
# [Usage]: RAY_IMAGE=$RAY_IMAGE OPERATOR_IMAGE=$OPERATOR_IMAGE python3 tests/compatibility-test.py
# These 3 environment variables are optional.
# [Example]:
RAY_IMAGE=rayproject/ray:2.2.0 OPERATOR_IMAGE=kuberay/operator:nightly python3 tests/compatibility-test.py
RAY_IMAGE=rayproject/ray:2.3.0 OPERATOR_IMAGE=kuberay/operator:nightly python3 tests/compatibility-test.py
```
### Running configuration tests locally.

Expand All @@ -173,9 +173,9 @@ and `tests/test_sample_rayservice_yamls.py`. Currently, only a few of these samp

```bash
# Test RayCluster doc examples.
RAY_IMAGE=rayproject/ray:2.2.0 OPERATOR_IMAGE=kuberay/operator:nightly python3 tests/test_sample_raycluster_yamls.py
RAY_IMAGE=rayproject/ray:2.3.0 OPERATOR_IMAGE=kuberay/operator:nightly python3 tests/test_sample_raycluster_yamls.py
# Test RayService doc examples.
RAY_IMAGE=rayproject/ray:2.2.0 OPERATOR_IMAGE=kuberay/operator:nightly python3 tests/test_sample_rayservice_yamls.py
RAY_IMAGE=rayproject/ray:2.3.0 OPERATOR_IMAGE=kuberay/operator:nightly python3 tests/test_sample_rayservice_yamls.py
```

See [KubeRay PR #605](https://github.com/ray-project/kuberay/pull/605) for more details about the test framework.
8 changes: 4 additions & 4 deletions ray-operator/apis/ray/v1alpha1/rayjob_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var expectedRayJob = RayJob{
Containers: []corev1.Container{
{
Name: "ray-head",
Image: "rayproject/ray:2.2.0",
Image: "rayproject/ray:2.3.0",
Env: []corev1.EnvVar{
{
Name: "MY_POD_IP",
Expand Down Expand Up @@ -111,7 +111,7 @@ var expectedRayJob = RayJob{
Containers: []corev1.Container{
{
Name: "ray-worker",
Image: "rayproject/ray:2.2.0",
Image: "rayproject/ray:2.3.0",
Command: []string{"echo"},
Args: []string{"Hello Ray"},
Env: []corev1.EnvVar{
Expand Down Expand Up @@ -175,7 +175,7 @@ var testRayJobJSON = `{
"containers": [
{
"name": "ray-head",
"image": "rayproject/ray:2.2.0",
"image": "rayproject/ray:2.3.0",
"ports": [
{
"name": "gcs-server",
Expand Down Expand Up @@ -238,7 +238,7 @@ var testRayJobJSON = `{
"containers": [
{
"name": "ray-worker",
"image": "rayproject/ray:2.2.0",
"image": "rayproject/ray:2.3.0",
"command": [
"echo"
],
Expand Down
8 changes: 4 additions & 4 deletions ray-operator/apis/ray/v1alpha1/rayservice_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ var myRayService = &RayService{
Containers: []corev1.Container{
{
Name: "ray-head",
Image: "rayproject/ray:2.2.0",
Image: "rayproject/ray:2.3.0",
Env: []corev1.EnvVar{
{
Name: "MY_POD_IP",
Expand Down Expand Up @@ -164,7 +164,7 @@ var myRayService = &RayService{
Containers: []corev1.Container{
{
Name: "ray-worker",
Image: "rayproject/ray:2.2.0",
Image: "rayproject/ray:2.3.0",
Command: []string{"echo"},
Args: []string{"Hello Ray"},
Env: []corev1.EnvVar{
Expand Down Expand Up @@ -267,7 +267,7 @@ var expected = `{
"containers":[
{
"name":"ray-head",
"image":"rayproject/ray:2.2.0",
"image":"rayproject/ray:2.3.0",
"ports":[
{
"name":"gcs-server",
Expand Down Expand Up @@ -335,7 +335,7 @@ var expected = `{
"containers":[
{
"name":"ray-worker",
"image":"rayproject/ray:2.2.0",
"image":"rayproject/ray:2.3.0",
"command":[
"echo"
],
Expand Down
6 changes: 3 additions & 3 deletions ray-operator/config/samples/ray-cluster.autoscaler.large.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
name: raycluster-autoscaler
spec:
# The version of Ray you are using. Make sure all Ray containers are running this version of Ray.
rayVersion: '2.2.0'
rayVersion: '2.3.0'
# If enableInTreeAutoscaling is true, the autoscaler sidecar will be added to the Ray head pod.
# Ray autoscaler integration is supported only for Ray versions >= 1.11.0
# Ray autoscaler integration is Beta with KubeRay >= 0.3.0 and Ray >= 2.0.0.
Expand Down Expand Up @@ -74,7 +74,7 @@ spec:
containers:
# The Ray head container
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
imagePullPolicy: Always
# Optimal resource allocation will depend on your Kubernetes infrastructure and might
# require some experimentation.
Expand Down Expand Up @@ -134,7 +134,7 @@ spec:
command: ['sh', '-c', "until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do echo waiting for K8s Service $RAY_IP; sleep 2; done"]
containers:
- name: ray-worker
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
# Optimal resource allocation will depend on your Kubernetes infrastructure and might
# require some experimentation.
# Setting requests=limits is recommended with Ray. K8s limits are used for Ray-internal
Expand Down
6 changes: 3 additions & 3 deletions ray-operator/config/samples/ray-cluster.autoscaler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
name: raycluster-autoscaler
spec:
# The version of Ray you are using. Make sure all Ray containers are running this version of Ray.
rayVersion: '2.2.0'
rayVersion: '2.3.0'
# If enableInTreeAutoscaling is true, the autoscaler sidecar will be added to the Ray head pod.
# Ray autoscaler integration is supported only for Ray versions >= 1.11.0
# Ray autoscaler integration is Beta with KubeRay >= 0.3.0 and Ray >= 2.0.0.
Expand Down Expand Up @@ -65,7 +65,7 @@ spec:
containers:
# The Ray head container
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
imagePullPolicy: Always
ports:
- containerPort: 6379
Expand Down Expand Up @@ -128,7 +128,7 @@ spec:
command: ['sh', '-c', "until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do echo waiting for K8s Service $RAY_IP; sleep 2; done"]
containers:
- name: ray-worker
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
lifecycle:
preStop:
exec:
Expand Down
6 changes: 3 additions & 3 deletions ray-operator/config/samples/ray-cluster.complete.large.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
# A unique identifier for the head node and workers of this cluster.
name: raycluster-complete
spec:
rayVersion: '2.2.0'
rayVersion: '2.3.0'
# Ray head pod template
headGroupSpec:
# Kubernetes Service Type. This is an optional field, and the default value is ClusterIP.
Expand All @@ -35,7 +35,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
# Optimal resource allocation will depend on your Kubernetes infrastructure and might
# require some experimentation.
# Setting requests=limits is recommended with Ray. K8s limits are used for Ray-internal
Expand Down Expand Up @@ -89,7 +89,7 @@ spec:
spec:
containers:
- name: ray-worker
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
# Optimal resource allocation will depend on your Kubernetes infrastructure and might
# require some experimentation.
# Setting requests=limits is recommended with Ray. K8s limits are used for Ray-internal
Expand Down
6 changes: 3 additions & 3 deletions ray-operator/config/samples/ray-cluster.complete.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
# A unique identifier for the head node and workers of this cluster.
name: raycluster-complete
spec:
rayVersion: '2.2.0'
rayVersion: '2.3.0'
# Ray head pod configuration
headGroupSpec:
# Kubernetes Service Type. This is an optional field, and the default value is ClusterIP.
Expand All @@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
ports:
- containerPort: 6379
name: gcs
Expand Down Expand Up @@ -89,7 +89,7 @@ spec:
spec:
containers:
- name: ray-worker
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
lifecycle:
preStop:
exec:
Expand Down
6 changes: 3 additions & 3 deletions ray-operator/config/samples/ray-cluster.external-redis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ metadata:
# An unique identifier for the head node and workers of this cluster.
name: raycluster-external-redis
spec:
rayVersion: '2.2.0'
rayVersion: '2.3.0'
headGroupSpec:
serviceType: ClusterIP # optional
replicas: 1
Expand All @@ -90,7 +90,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
env:
# RAY_REDIS_ADDRESS can force ray to use external redis
- name: RAY_REDIS_ADDRESS
Expand Down Expand Up @@ -128,7 +128,7 @@ spec:
command: ['sh', '-c', "until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do echo waiting for K8s Service $RAY_IP; sleep 2; done"]
containers:
- name: ray-worker
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
volumeMounts:
- mountPath: /tmp/ray
name: ray-logs
Expand Down
4 changes: 2 additions & 2 deletions ray-operator/config/samples/ray-cluster.getting-started.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
# An unique identifier for the head node and workers of this cluster.
name: raycluster-getting-started
spec:
rayVersion: '2.2.0' # should match the Ray version in the image of the containers
rayVersion: '2.3.0' # should match the Ray version in the image of the containers
# Ray head pod template
headGroupSpec:
serviceType: ClusterIP # optional
Expand All @@ -24,7 +24,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
volumeMounts:
- mountPath: /opt
name: config
Expand Down
4 changes: 2 additions & 2 deletions ray-operator/config/samples/ray-cluster.head-command.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
# An unique identifier for the head node and workers of this cluster.
name: raycluster-mini
spec:
rayVersion: '2.2.0' # should match the Ray version in the image of the containers
rayVersion: '2.3.0' # should match the Ray version in the image of the containers
# Ray head pod template
headGroupSpec:
serviceType: ClusterIP # optional
Expand All @@ -22,7 +22,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.2.0
image: rayproject/ray:2.3.0
resources:
limits:
cpu: 1
Expand Down
Loading

0 comments on commit 08572b4

Please sign in to comment.