[CI] Update latest ray version 2.5.0 -> 2.6.3 (#1320)

Update all files to Ray version 2.6.3 as in [2.5.0 Release] Change version numbers 2.4.0 -> 2.5.0 #1151 Update the Ray version used in the sample Job yaml test to Ray 2.6.2 and remove old ray versions that we don't guarantee compatibility with. This reduces costs and reduces the impact of flaky tests. We support the last three Ray stable versions and the last 1.x Ray version. --------- Signed-off-by: Archit Kulkarni <[email protected]>
ray-project · Aug 25, 2023 · 4fbdb9e · 4fbdb9e
1 parent de8bc26
commit 4fbdb9e
Show file tree

Hide file tree

Showing 48 changed files with 143 additions and 183 deletions.
diff --git a/.github/workflows/test-job.yaml b/.github/workflows/test-job.yaml
@@ -307,53 +307,13 @@ jobs:
         with:
           ray_version: 1.13.0
 
-  test-compatibility-2_1_0:
-    needs:
-      - build_operator
-      - build_apiserver
-      - lint
-    runs-on: ubuntu-latest
-    name: Compatibility Test - 2.1.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.1.0
-
-  test-compatibility-2_2_0:
-    needs:
-      - build_operator
-      - build_apiserver
-      - lint
-    runs-on: ubuntu-latest
-    name: Compatibility Test - 2.2.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.2.0
-
-  test-compatibility-2_3_0:
+  test-compatibility-2_4_0:
     needs:
       - build_operator
       - build_apiserver
       - lint
     runs-on: ubuntu-latest
-    name: Compatibility Test - 2.3.0
+    name: Compatibility Test - 2.4.0
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -365,15 +325,15 @@ jobs:
 
       - uses: ./.github/workflows/actions/compatibility
         with:
-          ray_version: 2.3.0
+          ray_version: 2.4.0
 
-  test-compatibility-2_4_0:
+  test-compatibility-2_5_0:
     needs:
       - build_operator
       - build_apiserver
       - lint
     runs-on: ubuntu-latest
-    name: Compatibility Test - 2.4.0
+    name: Compatibility Test - 2.5.0
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -385,15 +345,15 @@ jobs:
 
       - uses: ./.github/workflows/actions/compatibility
         with:
-          ray_version: 2.4.0
-
-  test-compatibility-2_5_0:
+          ray_version: 2.5.0
+  
+  test-compatibility-2_6_3:
     needs:
       - build_operator
       - build_apiserver
       - lint
     runs-on: ubuntu-latest
-    name: Compatibility Test - 2.5.0
+    name: Compatibility Test - 2.6.3
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -405,7 +365,7 @@ jobs:
 
       - uses: ./.github/workflows/actions/compatibility
         with:
-          ray_version: 2.5.0
+          ray_version: 2.6.3
 
   test-compatibility-nightly:
     needs:

diff --git a/apiserver/README.md b/apiserver/README.md
@@ -194,7 +194,7 @@ curl -X POST 'localhost:31888/apis/v1alpha2/namespaces/ray-system/services' \
   "clusterSpec": {
     "headGroupSpec": {
       "computeTemplate": "default-template",
-      "image": "rayproject/ray:2.5.0",
+      "image": "rayproject/ray:2.6.3",
       "serviceType": "NodePort",
       "rayStartParams": {
             "dashboard-host": "0.0.0.0",
@@ -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.5.0",
+        "image": "rayproject/ray:2.6.3",
         "replicas": 1,
         "minReplicas": 0,
         "maxReplicas": 5,

diff --git a/apiserver/pkg/model/converter_test.go b/apiserver/pkg/model/converter_test.go
@@ -62,7 +62,7 @@ var headSpecTest = v1alpha1.HeadGroupSpec{
 			Containers: []v1.Container{
 				{
 					Name:  "ray-head",
-					Image: "blublinsky1/ray310:2.5.0",
+					Image: "blublinsky1/ray310:2.6.3",
 					Env: []v1.EnvVar{
 						{
 							Name:  "AWS_KEY",
@@ -162,7 +162,7 @@ var workerSpecTest = v1alpha1.WorkerGroupSpec{
 			Containers: []v1.Container{
 				{
 					Name:  "ray-worker",
-					Image: "blublinsky1/ray310:2.5.0",
+					Image: "blublinsky1/ray310:2.6.3",
 					Env: []v1.EnvVar{
 						{
 							Name:  "AWS_KEY",

diff --git a/clients/python-client/examples/use-raw-config_map_with-api.py b/clients/python-client/examples/use-raw-config_map_with-api.py
@@ -47,7 +47,7 @@
     "name": "raycluster-getting-started"
   },
   "spec": {
-    "rayVersion": "2.5.0",
+    "rayVersion": "2.6.3",
     "headGroupSpec": {
       "rayStartParams": {
         "dashboard-host": "0.0.0.0",
@@ -58,7 +58,7 @@
           "containers": [
             {
               "name": "ray-head",
-              "image": "rayproject/ray:2.5.0",
+              "image": "rayproject/ray:2.6.3",
               "volumeMounts": [
                 {
                   "mountPath": "/opt",

diff --git a/clients/python-client/examples/use-raw-with-api.py b/clients/python-client/examples/use-raw-with-api.py
@@ -28,7 +28,7 @@
         "name": "raycluster-mini-raw",
     },
     "spec": {
-        "rayVersion": "2.5.0",
+        "rayVersion": "2.6.3",
         "headGroupSpec": {
             "rayStartParams": {
                 "dashboard-host": "0.0.0.0",
@@ -39,7 +39,7 @@
                     "containers": [
                         {
                             "name": "ray-head",
-                            "image": "rayproject/ray:2.5.0",
+                            "image": "rayproject/ray:2.6.3",
                             "resources": {
                                 "limits": {"cpu": 1, "memory": "2Gi"},
                                 "requests": {"cpu": "500m", "memory": "2Gi"},
@@ -66,7 +66,7 @@
         "name": "raycluster-complete-raw",
     },
     "spec": {
-        "rayVersion": "2.5.0",
+        "rayVersion": "2.6.3",
         "headGroupSpec": {
             "rayStartParams": {"dashboard-host": "0.0.0.0"},
             "template": {
@@ -75,7 +75,7 @@
                     "containers": [
                         {
                             "name": "ray-head",
-                            "image": "rayproject/ray:2.5.0",
+                            "image": "rayproject/ray:2.6.3",
                             "ports": [
                                 {"containerPort": 6379, "name": "gcs"},
                                 {"containerPort": 8265, "name": "dashboard"},
@@ -111,7 +111,7 @@
                         "containers": [
                             {
                                 "name": "ray-worker",
-                                "image": "rayproject/ray:2.5.0",
+                                "image": "rayproject/ray:2.6.3",
                                 "lifecycle": {
                                     "preStop": {
                                         "exec": {

diff --git a/clients/python-client/python_client/utils/kuberay_cluster_builder.py b/clients/python-client/python_client/utils/kuberay_cluster_builder.py
@@ -60,15 +60,15 @@ def build_meta(
         name: str,
         k8s_namespace: str = "default",
         labels: dict = None,
-        ray_version: str = "2.5.0",
+        ray_version: str = "2.6.3",
     ):
         """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.5.0".
+        - ray_version (str, optional): The version of Ray to use for the cluster. Defaults to "2.6.3".
         """
         self.cluster = self.cluster_utils.populate_meta(
             cluster=self.cluster,
@@ -81,7 +81,7 @@ def build_meta(
 
     def build_head(
         self,
-        ray_image: str = "rayproject/ray:2.5.0",
+        ray_image: str = "rayproject/ray:2.6.3",
         service_type: str = "ClusterIP",
         cpu_requests: str = "2",
         memory_requests: str = "3G",
@@ -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.5.0".
+        - ray_image (str): Docker image for the head node. Default value is "rayproject/ray:2.6.3".
         - 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".
@@ -118,7 +118,7 @@ def build_head(
     def build_worker(
         self,
         group_name: str,
-        ray_image: str = "rayproject/ray:2.5.0",
+        ray_image: str = "rayproject/ray:2.6.3",
         ray_command: Any = ["/bin/bash", "-lc"],
         init_image: str = "busybox:1.28",
         cpu_requests: str = "1",
@@ -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.5.0".
+        - ray_image (str, optional): Docker image for the Ray process. Default is "rayproject/ray:2.6.3".
         - 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".

diff --git a/clients/python-client/python_client_test/test_api.py b/clients/python-client/python_client_test/test_api.py
@@ -14,7 +14,7 @@
         "name": "raycluster-complete-raw",
     },
     "spec": {
-        "rayVersion": "2.5.0",
+        "rayVersion": "2.6.3",
         "headGroupSpec": {
             "rayStartParams": {"dashboard-host": "0.0.0.0"},
             "template": {
@@ -23,7 +23,7 @@
                     "containers": [
                         {
                             "name": "ray-head",
-                            "image": "rayproject/ray:2.5.0",
+                            "image": "rayproject/ray:2.6.3",
                             "ports": [
                                 {"containerPort": 6379, "name": "gcs"},
                                 {"containerPort": 8265, "name": "dashboard"},
@@ -59,7 +59,7 @@
                         "containers": [
                             {
                                 "name": "ray-worker",
-                                "image": "rayproject/ray:2.5.0",
+                                "image": "rayproject/ray:2.6.3",
                                 "lifecycle": {
                                     "preStop": {
                                         "exec": {
@@ -77,7 +77,7 @@
                             },
                             {
                                 "name": "side-car",
-                                "image": "rayproject/ray:2.5.0",
+                                "image": "rayproject/ray:2.6.3",
                                 "resources": {
                                     "limits": {"cpu": "1", "memory": "1G"},
                                     "requests": {"cpu": "500m", "memory": "1G"},

diff --git a/clients/python-client/python_client_test/test_utils.py b/clients/python-client/python_client_test/test_utils.py
@@ -13,7 +13,7 @@
         "name": "raycluster-complete-raw",
     },
     "spec": {
-        "rayVersion": "2.5.0",
+        "rayVersion": "2.6.3",
         "headGroupSpec": {
             "rayStartParams": {"dashboard-host": "0.0.0.0"},
             "template": {
@@ -22,7 +22,7 @@
                     "containers": [
                         {
                             "name": "ray-head",
-                            "image": "rayproject/ray:2.5.0",
+                            "image": "rayproject/ray:2.6.3",
                             "ports": [
                                 {"containerPort": 6379, "name": "gcs"},
                                 {"containerPort": 8265, "name": "dashboard"},
@@ -58,7 +58,7 @@
                         "containers": [
                             {
                                 "name": "ray-worker",
-                                "image": "rayproject/ray:2.5.0",
+                                "image": "rayproject/ray:2.6.3",
                                 "lifecycle": {
                                     "preStop": {
                                         "exec": {
@@ -76,7 +76,7 @@
                             },
                             {
                                 "name": "side-car",
-                                "image": "rayproject/ray:2.5.0",
+                                "image": "rayproject/ray:2.6.3",
                                 "resources": {
                                     "limits": {"cpu": "1", "memory": "1G"},
                                     "requests": {"cpu": "500m", "memory": "1G"},
@@ -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.5.0",
+            ray_image="rayproject/ray:2.6.3",
             ray_command=["/bin/bash", "-lc"],
             init_image="busybox:1.28",
             cpu_requests="3",
@@ -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.5.0")
+        self.assertEqual(container["image"], "rayproject/ray:2.6.3")
         self.assertEqual(container["command"], ["/bin/bash", "-lc"])
 
         resources = container["resources"]

diff --git a/docs/guidance/pod-command.md b/docs/guidance/pod-command.md
@@ -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.5.0
+          image: rayproject/ray:2.6.3
           resources:
             ...
           ports:

diff --git a/docs/guidance/prometheus-grafana.md b/docs/guidance/prometheus-grafana.md
@@ -334,7 +334,7 @@ Refer to [this Grafana document](https://grafana.com/tutorials/run-grafana-behin
   * Click "Import".
   * Click "Upload JSON file".
   * Choose a JSON file.
-    * Case 1: If you are using Ray 2.5.0, you can use [config/grafana/default_grafana_dashboard.json](https://github.com/ray-project/kuberay/blob/master/config/grafana/default_grafana_dashboard.json).
+    * Case 1: If you are using Ray 2.5.0 or newer, you can use [config/grafana/default_grafana_dashboard.json](https://github.com/ray-project/kuberay/blob/master/config/grafana/default_grafana_dashboard.json).
     * Case 2: Otherwise, you should import the `default_grafana_dashboard.json` file from `/tmp/ray/session_latest/metrics/grafana/dashboards/` in the head Pod. You can use `kubectl cp` to copy the file from the head Pod to your local machine.
   * Click "Import".