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.

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

[2.5.0 Release] Change version numbers 2.4.0 -> 2.5.0 #1151

Merged
merged 1 commit into from
Jun 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 23 additions & 3 deletions .github/workflows/test-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,26 @@ jobs:
with:
ray_version: 2.4.0

test-compatibility-2_5_0:
needs:
- build_operator
- build_apiserver
- lint
runs-on: ubuntu-latest
name: Compatibility Test - 2.5.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.5.0

test-compatibility-nightly:
needs:
- build_operator
Expand All @@ -380,13 +400,13 @@ jobs:
with:
ray_version: nightly

sample-yaml-config-test-2_3_0:
sample-yaml-config-test-2_5_0:
needs:
- build_operator
- build_apiserver
- lint
runs-on: ubuntu-latest
name: Sample YAML Config Test - 2.4.0
name: Sample YAML Config Test - 2.5.0
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand All @@ -397,7 +417,7 @@ jobs:
ref: ${{github.event.pull_request.head.sha}}
- uses: ./.github/workflows/actions/configuration
with:
ray_version: 2.4.0
ray_version: 2.5.0

python-client-test:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions apiserver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ curl -X POST 'localhost:31888/apis/v1alpha2/namespaces/ray-system/services' \
"clusterSpec": {
"headGroupSpec": {
"computeTemplate": "default-template",
"image": "rayproject/ray:2.4.0",
"image": "rayproject/ray:2.5.0",
"serviceType": "NodePort",
"rayStartParams": {
"dashboard-host": "0.0.0.0",
Expand All @@ -206,7 +206,7 @@ curl -X POST 'localhost:31888/apis/v1alpha2/namespaces/ray-system/services' \
{
"groupName": "small-wg",
"computeTemplate": "default-template",
"image": "rayproject/ray:2.4.0",
"image": "rayproject/ray:2.5.0",
"replicas": 1,
"minReplicas": 0,
"maxReplicas": 5,
Expand Down
4 changes: 2 additions & 2 deletions apiserver/pkg/model/converter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ var headSpecTest = v1alpha1.HeadGroupSpec{
Containers: []v1.Container{
{
Name: "ray-head",
Image: "blublinsky1/ray310:2.4.0",
Image: "blublinsky1/ray310:2.5.0",
Env: []v1.EnvVar{
{
Name: "AWS_KEY",
Expand Down Expand Up @@ -154,7 +154,7 @@ var workerSpecTest = v1alpha1.WorkerGroupSpec{
Containers: []v1.Container{
{
Name: "ray-worker",
Image: "blublinsky1/ray310:2.4.0",
Image: "blublinsky1/ray310:2.5.0",
Env: []v1.EnvVar{
{
Name: "AWS_KEY",
Expand Down
4 changes: 2 additions & 2 deletions clients/python-client/examples/use-raw-config_map_with-api.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"name": "raycluster-getting-started"
},
"spec": {
"rayVersion": "2.4.0",
"rayVersion": "2.5.0",
"headGroupSpec": {
"rayStartParams": {
"dashboard-host": "0.0.0.0",
Expand All @@ -58,7 +58,7 @@
"containers": [
{
"name": "ray-head",
"image": "rayproject/ray:2.4.0",
"image": "rayproject/ray:2.5.0",
"volumeMounts": [
{
"mountPath": "/opt",
Expand Down
10 changes: 5 additions & 5 deletions clients/python-client/examples/use-raw-with-api.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"name": "raycluster-mini-raw",
},
"spec": {
"rayVersion": "2.4.0",
"rayVersion": "2.5.0",
"headGroupSpec": {
"rayStartParams": {
"dashboard-host": "0.0.0.0",
Expand All @@ -39,7 +39,7 @@
"containers": [
{
"name": "ray-head",
"image": "rayproject/ray:2.4.0",
"image": "rayproject/ray:2.5.0",
"resources": {
"limits": {"cpu": 1, "memory": "2Gi"},
"requests": {"cpu": "500m", "memory": "2Gi"},
Expand All @@ -66,7 +66,7 @@
"name": "raycluster-complete-raw",
},
"spec": {
"rayVersion": "2.4.0",
"rayVersion": "2.5.0",
"headGroupSpec": {
"rayStartParams": {"dashboard-host": "0.0.0.0"},
"template": {
Expand All @@ -75,7 +75,7 @@
"containers": [
{
"name": "ray-head",
"image": "rayproject/ray:2.4.0",
"image": "rayproject/ray:2.5.0",
"ports": [
{"containerPort": 6379, "name": "gcs"},
{"containerPort": 8265, "name": "dashboard"},
Expand Down Expand Up @@ -111,7 +111,7 @@
"containers": [
{
"name": "ray-worker",
"image": "rayproject/ray:2.4.0",
"image": "rayproject/ray:2.5.0",
"lifecycle": {
"preStop": {
"exec": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ def build_meta(
name: str,
k8s_namespace: str = "default",
labels: dict = None,
ray_version: str = "2.4.0",
ray_version: str = "2.5.0",
):
"""Builds the metadata and ray version of the cluster.

Parameters:
- name (str): The name of the cluster.
- k8s_namespace (str, optional): The namespace in which the Ray cluster exists. Defaults to "default".
- labels (dict, optional): A dictionary of key-value pairs to add as labels to the cluster. Defaults to None.
- ray_version (str, optional): The version of Ray to use for the cluster. Defaults to "2.4.0".
- ray_version (str, optional): The version of Ray to use for the cluster. Defaults to "2.5.0".
"""
self.cluster = self.cluster_utils.populate_meta(
cluster=self.cluster,
Expand All @@ -81,7 +81,7 @@ def build_meta(

def build_head(
self,
ray_image: str = "rayproject/ray:2.4.0",
ray_image: str = "rayproject/ray:2.5.0",
service_type: str = "ClusterIP",
cpu_requests: str = "2",
memory_requests: str = "3G",
Expand All @@ -94,7 +94,7 @@ def build_head(
"""Build head node of the ray cluster.

Parameters:
- ray_image (str): Docker image for the head node. Default value is "rayproject/ray:2.4.0".
- ray_image (str): Docker image for the head node. Default value is "rayproject/ray:2.5.0".
- service_type (str): Service type of the head node. Default value is "ClusterIP".
- cpu_requests (str): CPU requests for the head node. Default value is "2".
- memory_requests (str): Memory requests for the head node. Default value is "3G".
Expand All @@ -118,7 +118,7 @@ def build_head(
def build_worker(
self,
group_name: str,
ray_image: str = "rayproject/ray:2.4.0",
ray_image: str = "rayproject/ray:2.5.0",
ray_command: Any = ["/bin/bash", "-lc"],
init_image: str = "busybox:1.28",
cpu_requests: str = "1",
Expand All @@ -136,7 +136,7 @@ def build_worker(

Parameters:
- group_name (str): name of the worker group.
- ray_image (str, optional): Docker image for the Ray process. Default is "rayproject/ray:2.4.0".
- ray_image (str, optional): Docker image for the Ray process. Default is "rayproject/ray:2.5.0".
- ray_command (Any, optional): Command to run in the Docker container. Default is ["/bin/bash", "-lc"].
- init_image (str, optional): Docker image for the init container. Default is "busybox:1.28".
- cpu_requests (str, optional): CPU requests for the worker pods. Default is "1".
Expand Down
8 changes: 4 additions & 4 deletions clients/python-client/python_client_test/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"name": "raycluster-complete-raw",
},
"spec": {
"rayVersion": "2.4.0",
"rayVersion": "2.5.0",
"headGroupSpec": {
"rayStartParams": {"dashboard-host": "0.0.0.0"},
"template": {
Expand All @@ -23,7 +23,7 @@
"containers": [
{
"name": "ray-head",
"image": "rayproject/ray:2.4.0",
"image": "rayproject/ray:2.5.0",
"ports": [
{"containerPort": 6379, "name": "gcs"},
{"containerPort": 8265, "name": "dashboard"},
Expand Down Expand Up @@ -59,7 +59,7 @@
"containers": [
{
"name": "ray-worker",
"image": "rayproject/ray:2.4.0",
"image": "rayproject/ray:2.5.0",
"lifecycle": {
"preStop": {
"exec": {
Expand All @@ -77,7 +77,7 @@
},
{
"name": "side-car",
"image": "rayproject/ray:2.4.0",
"image": "rayproject/ray:2.5.0",
"resources": {
"limits": {"cpu": "1", "memory": "1G"},
"requests": {"cpu": "500m", "memory": "1G"},
Expand Down
12 changes: 6 additions & 6 deletions clients/python-client/python_client_test/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"name": "raycluster-complete-raw",
},
"spec": {
"rayVersion": "2.4.0",
"rayVersion": "2.5.0",
"headGroupSpec": {
"rayStartParams": {"dashboard-host": "0.0.0.0"},
"template": {
Expand All @@ -22,7 +22,7 @@
"containers": [
{
"name": "ray-head",
"image": "rayproject/ray:2.4.0",
"image": "rayproject/ray:2.5.0",
"ports": [
{"containerPort": 6379, "name": "gcs"},
{"containerPort": 8265, "name": "dashboard"},
Expand Down Expand Up @@ -58,7 +58,7 @@
"containers": [
{
"name": "ray-worker",
"image": "rayproject/ray:2.4.0",
"image": "rayproject/ray:2.5.0",
"lifecycle": {
"preStop": {
"exec": {
Expand All @@ -76,7 +76,7 @@
},
{
"name": "side-car",
"image": "rayproject/ray:2.4.0",
"image": "rayproject/ray:2.5.0",
"resources": {
"limits": {"cpu": "1", "memory": "1G"},
"requests": {"cpu": "500m", "memory": "1G"},
Expand Down Expand Up @@ -115,7 +115,7 @@ def __init__(self, methodName: str = ...) -> None:
def test_populate_worker_group(self):
worker_group, succeeded = self.utils.populate_worker_group(
group_name="small-group",
ray_image="rayproject/ray:2.4.0",
ray_image="rayproject/ray:2.5.0",
ray_command=["/bin/bash", "-lc"],
init_image="busybox:1.28",
cpu_requests="3",
Expand All @@ -137,7 +137,7 @@ def test_populate_worker_group(self):
self.assertEqual(worker_group["replicas"], 1)

container = worker_group["template"]["spec"]["containers"][0]
self.assertEqual(container["image"], "rayproject/ray:2.4.0")
self.assertEqual(container["image"], "rayproject/ray:2.5.0")
self.assertEqual(container["command"], ["/bin/bash", "-lc"])

resources = container["resources"]
Expand Down
2 changes: 1 addition & 1 deletion docs/guidance/aws-eks-iam.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The root cause is that the version of `boto3` in the Ray image is too old. To el
a more recent version (1.26) is currently available as per https://pypi.org/project/boto3/#history. The `boto3` 1.4.8 does not support to initialize the security credentials automatically in some cases (e.g. `AssumeRoleWithWebIdentity`).

```shell
# image: rayproject/ray:2.4.0
# image: rayproject/ray:2.5.0
pip freeze | grep boto
# boto3==1.4.8
# botocore==1.8.50
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.4.0
image: rayproject/ray:2.5.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,15 +42,15 @@ metadata:
ray.io/scheduler-name: volcano
volcano.sh/queue-name: kuberay-test-queue
spec:
rayVersion: '2.4.0'
rayVersion: '2.5.0'
headGroupSpec:
rayStartParams: {}
replicas: 1
template:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.4.0
image: rayproject/ray:2.5.0
resources:
limits:
cpu: "1"
Expand Down Expand Up @@ -104,15 +104,15 @@ metadata:
ray.io/scheduler-name: volcano
volcano.sh/queue-name: kuberay-test-queue
spec:
rayVersion: '2.4.0'
rayVersion: '2.5.0'
headGroupSpec:
rayStartParams: {}
replicas: 1
template:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.4.0
image: rayproject/ray:2.5.0
resources:
limits:
cpu: "1"
Expand All @@ -130,7 +130,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.4.0
image: rayproject/ray:2.5.0
resources:
limits:
cpu: "1"
Expand Down Expand Up @@ -215,15 +215,15 @@ metadata:
ray.io/scheduler-name: volcano
volcano.sh/queue-name: kuberay-test-queue
spec:
rayVersion: '2.4.0'
rayVersion: '2.5.0'
headGroupSpec:
rayStartParams: {}
replicas: 1
template:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.4.0
image: rayproject/ray:2.5.0
resources:
limits:
cpu: "1"
Expand All @@ -241,7 +241,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray:2.4.0
image: rayproject/ray:2.5.0
resources:
limits:
cpu: "1"
Expand Down
Loading