diff --git a/.github/workflows/test-job.yaml b/.github/workflows/test-job.yaml index 7b73d784a1..b7920a7e07 100644 --- 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 index 3941fded24..8be8b894a4 100644 --- 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 index e4e7805bfb..c165438dea 100644 --- 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 index 2f5f789940..b29e7ef07c 100644 --- 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 index 8766a813a9..afe55134c5 100644 --- 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 index 21e829f53b..f738f6d8fc 100644 --- a/clients/python-client/python_client/utils/kuberay_cluster_builder.py +++ b/clients/python-client/python_client/utils/kuberay_cluster_builder.py @@ -60,7 +60,7 @@ 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. @@ -68,7 +68,7 @@ def build_meta( - 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 index 3df636d597..a68716c4fe 100644 --- 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 index a744bd4181..667283b9d8 100644 --- 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 index 6058b7aa4a..d2ad872782 100644 --- 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 index fe9c6bcbaa..2abca870e1 100644 --- 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". diff --git a/docs/guidance/volcano-integration.md b/docs/guidance/volcano-integration.md index 630b81c4b3..3b2420ebcb 100644 --- a/docs/guidance/volcano-integration.md +++ b/docs/guidance/volcano-integration.md @@ -42,7 +42,7 @@ metadata: ray.io/scheduler-name: volcano volcano.sh/queue-name: kuberay-test-queue spec: - rayVersion: '2.5.0' + rayVersion: '2.6.3' headGroupSpec: rayStartParams: {} replicas: 1 @@ -50,7 +50,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: "1" @@ -104,7 +104,7 @@ metadata: ray.io/scheduler-name: volcano volcano.sh/queue-name: kuberay-test-queue spec: - rayVersion: '2.5.0' + rayVersion: '2.6.3' headGroupSpec: rayStartParams: {} replicas: 1 @@ -112,7 +112,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: "1" @@ -130,7 +130,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: "1" @@ -215,7 +215,7 @@ metadata: ray.io/scheduler-name: volcano volcano.sh/queue-name: kuberay-test-queue spec: - rayVersion: '2.5.0' + rayVersion: '2.6.3' headGroupSpec: rayStartParams: {} replicas: 1 @@ -223,7 +223,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: "1" @@ -241,7 +241,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: "1" diff --git a/helm-chart/ray-cluster/values.yaml b/helm-chart/ray-cluster/values.yaml index b023eaa7ea..6024158eb1 100644 --- a/helm-chart/ray-cluster/values.yaml +++ b/helm-chart/ray-cluster/values.yaml @@ -7,7 +7,7 @@ image: repository: rayproject/ray - tag: 2.5.0 + tag: 2.6.3 pullPolicy: IfNotPresent nameOverride: "kuberay" @@ -19,7 +19,7 @@ imagePullSecrets: [] head: # rayVersion determines the autoscaler's image version. # It should match the Ray version in the image of the containers. - # rayVersion: 2.5.0 + # rayVersion: 2.6.3 # 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. diff --git a/ray-operator/DEVELOPMENT.md b/ray-operator/DEVELOPMENT.md index c9c5204cdd..926731905a 100644 --- a/ray-operator/DEVELOPMENT.md +++ b/ray-operator/DEVELOPMENT.md @@ -205,7 +205,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.5.0 OPERATOR_IMAGE=kuberay/operator:nightly python3 tests/compatibility-test.py + RAY_IMAGE=rayproject/ray:2.6.3 OPERATOR_IMAGE=kuberay/operator:nightly python3 tests/compatibility-test.py ``` ### Running configuration tests locally. @@ -215,9 +215,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.5.0 OPERATOR_IMAGE=kuberay/operator:nightly python3 tests/test_sample_raycluster_yamls.py +RAY_IMAGE=rayproject/ray:2.6.3 OPERATOR_IMAGE=kuberay/operator:nightly python3 tests/test_sample_raycluster_yamls.py # Test RayService doc examples. -RAY_IMAGE=rayproject/ray:2.5.0 OPERATOR_IMAGE=kuberay/operator:nightly python3 tests/test_sample_rayservice_yamls.py +RAY_IMAGE=rayproject/ray:2.6.3 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. diff --git a/ray-operator/apis/ray/v1alpha1/rayjob_types_test.go b/ray-operator/apis/ray/v1alpha1/rayjob_types_test.go index ae9447e64a..7c525bb89e 100644 --- a/ray-operator/apis/ray/v1alpha1/rayjob_types_test.go +++ b/ray-operator/apis/ray/v1alpha1/rayjob_types_test.go @@ -46,7 +46,7 @@ var expectedRayJob = RayJob{ Containers: []corev1.Container{ { Name: "ray-head", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Env: []corev1.EnvVar{ { Name: "MY_POD_IP", @@ -107,7 +107,7 @@ var expectedRayJob = RayJob{ Containers: []corev1.Container{ { Name: "ray-worker", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Command: []string{"echo"}, Args: []string{"Hello Ray"}, Env: []corev1.EnvVar{ @@ -168,7 +168,7 @@ var testRayJobJSON = `{ "containers": [ { "name": "ray-head", - "image": "rayproject/ray:2.5.0", + "image": "rayproject/ray:2.6.3", "ports": [ { "name": "gcs-server", @@ -230,7 +230,7 @@ var testRayJobJSON = `{ "containers": [ { "name": "ray-worker", - "image": "rayproject/ray:2.5.0", + "image": "rayproject/ray:2.6.3", "command": [ "echo" ], diff --git a/ray-operator/apis/ray/v1alpha1/rayservice_types_test.go b/ray-operator/apis/ray/v1alpha1/rayservice_types_test.go index 55281d4e2a..85c88d870e 100644 --- a/ray-operator/apis/ray/v1alpha1/rayservice_types_test.go +++ b/ray-operator/apis/ray/v1alpha1/rayservice_types_test.go @@ -94,7 +94,7 @@ var myRayService = &RayService{ Containers: []corev1.Container{ { Name: "ray-head", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Env: []corev1.EnvVar{ { Name: "MY_POD_IP", @@ -160,7 +160,7 @@ var myRayService = &RayService{ Containers: []corev1.Container{ { Name: "ray-worker", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Command: []string{"echo"}, Args: []string{"Hello Ray"}, Env: []corev1.EnvVar{ @@ -260,7 +260,7 @@ var expected = `{ "containers":[ { "name":"ray-head", - "image":"rayproject/ray:2.5.0", + "image":"rayproject/ray:2.6.3", "ports":[ { "name":"gcs-server", @@ -327,7 +327,7 @@ var expected = `{ "containers":[ { "name":"ray-worker", - "image":"rayproject/ray:2.5.0", + "image":"rayproject/ray:2.6.3", "command":[ "echo" ], diff --git a/ray-operator/config/samples/ray-cluster-tpu.yaml b/ray-operator/config/samples/ray-cluster-tpu.yaml index 410685dde7..b585dbfcf6 100644 --- a/ray-operator/config/samples/ray-cluster-tpu.yaml +++ b/ray-operator/config/samples/ray-cluster-tpu.yaml @@ -23,7 +23,7 @@ spec: - mountPath: /tmp/ray name: log-volume name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 imagePullPolicy: IfNotPresent ports: - containerPort: 6379 @@ -80,7 +80,7 @@ spec: - mountPath: /tmp/ray name: log-volume name: ray-worker - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 imagePullPolicy: IfNotPresent resources: limits: diff --git a/ray-operator/config/samples/ray-cluster.autoscaler.large.yaml b/ray-operator/config/samples/ray-cluster.autoscaler.large.yaml index fbd7ff9447..77e8479953 100644 --- a/ray-operator/config/samples/ray-cluster.autoscaler.large.yaml +++ b/ray-operator/config/samples/ray-cluster.autoscaler.large.yaml @@ -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.5.0' + rayVersion: '2.6.3' # 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. @@ -72,7 +72,7 @@ spec: containers: # The Ray head container - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 # 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 @@ -127,7 +127,7 @@ spec: spec: containers: - name: ray-worker - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 # 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 diff --git a/ray-operator/config/samples/ray-cluster.autoscaler.yaml b/ray-operator/config/samples/ray-cluster.autoscaler.yaml index d0d4c9cfb4..d343d5e1a1 100644 --- a/ray-operator/config/samples/ray-cluster.autoscaler.yaml +++ b/ray-operator/config/samples/ray-cluster.autoscaler.yaml @@ -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.5.0' + rayVersion: '2.6.3' # 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. @@ -64,7 +64,7 @@ spec: containers: # The Ray head container - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 ports: - containerPort: 6379 name: gcs @@ -122,7 +122,7 @@ spec: spec: containers: - name: ray-worker - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 lifecycle: preStop: exec: diff --git a/ray-operator/config/samples/ray-cluster.complete.large.yaml b/ray-operator/config/samples/ray-cluster.complete.large.yaml index a717a6d88c..6d7b547764 100644 --- a/ray-operator/config/samples/ray-cluster.complete.large.yaml +++ b/ray-operator/config/samples/ray-cluster.complete.large.yaml @@ -13,7 +13,7 @@ metadata: # A unique identifier for the head node and workers of this cluster. name: raycluster-complete spec: - rayVersion: '2.5.0' + rayVersion: '2.6.3' # Ray head pod template headGroupSpec: # Kubernetes Service Type. This is an optional field, and the default value is ClusterIP. @@ -36,7 +36,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 # 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 @@ -91,7 +91,7 @@ spec: spec: containers: - name: ray-worker - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 # 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 diff --git a/ray-operator/config/samples/ray-cluster.complete.yaml b/ray-operator/config/samples/ray-cluster.complete.yaml index 521e135d2d..e5aa82e56a 100644 --- a/ray-operator/config/samples/ray-cluster.complete.yaml +++ b/ray-operator/config/samples/ray-cluster.complete.yaml @@ -10,7 +10,7 @@ metadata: # A unique identifier for the head node and workers of this cluster. name: raycluster-complete spec: - rayVersion: '2.5.0' + rayVersion: '2.6.3' # Ray head pod configuration headGroupSpec: # Kubernetes Service Type. This is an optional field, and the default value is ClusterIP. @@ -30,7 +30,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 ports: - containerPort: 6379 name: gcs @@ -91,7 +91,7 @@ spec: spec: containers: - name: ray-worker - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 lifecycle: preStop: exec: diff --git a/ray-operator/config/samples/ray-cluster.custom-head-service.yaml b/ray-operator/config/samples/ray-cluster.custom-head-service.yaml index 11f2269b3b..cf35158dd9 100644 --- a/ray-operator/config/samples/ray-cluster.custom-head-service.yaml +++ b/ray-operator/config/samples/ray-cluster.custom-head-service.yaml @@ -11,7 +11,7 @@ metadata: # An unique identifier for the head node and workers of this cluster. name: raycluster-custom-head-service.yaml spec: - rayVersion: '2.5.0' # should match the Ray version in the image of the containers + rayVersion: '2.6.3' # should match the Ray version in the image of the containers # Ray head pod template headGroupSpec: # the following params are used to complete the ray start: ray start --head --block --redis-port=6379 ... @@ -36,7 +36,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: 1 diff --git a/ray-operator/config/samples/ray-cluster.embed-grafana.yaml b/ray-operator/config/samples/ray-cluster.embed-grafana.yaml index 53d51bfb35..f76197981b 100644 --- a/ray-operator/config/samples/ray-cluster.embed-grafana.yaml +++ b/ray-operator/config/samples/ray-cluster.embed-grafana.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 ports: - containerPort: 6379 name: gcs @@ -62,7 +62,7 @@ spec: spec: containers: - name: ray-worker - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 lifecycle: preStop: exec: diff --git a/ray-operator/config/samples/ray-cluster.external-redis.yaml b/ray-operator/config/samples/ray-cluster.external-redis.yaml index 06bbcef673..99bda13090 100644 --- a/ray-operator/config/samples/ray-cluster.external-redis.yaml +++ b/ray-operator/config/samples/ray-cluster.external-redis.yaml @@ -87,7 +87,7 @@ metadata: # An unique identifier for the head node and workers of this cluster. name: raycluster-external-redis spec: - rayVersion: '2.5.0' + rayVersion: '2.6.3' headGroupSpec: replicas: 1 # The `rayStartParams` are used to configure the `ray start` command. @@ -103,7 +103,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: "1" @@ -147,7 +147,7 @@ spec: spec: containers: - name: ray-worker - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 volumeMounts: - mountPath: /tmp/ray name: ray-logs diff --git a/ray-operator/config/samples/ray-cluster.head-command.yaml b/ray-operator/config/samples/ray-cluster.head-command.yaml index 9b978be0a1..0615cd875f 100644 --- a/ray-operator/config/samples/ray-cluster.head-command.yaml +++ b/ray-operator/config/samples/ray-cluster.head-command.yaml @@ -8,7 +8,7 @@ metadata: # An unique identifier for the head node and workers of this cluster. name: raycluster-mini spec: - rayVersion: '2.5.0' # should match the Ray version in the image of the containers + rayVersion: '2.6.3' # should match the Ray version in the image of the containers # Ray head pod template headGroupSpec: # The `rayStartParams` are used to configure the `ray start` command. @@ -21,7 +21,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: 1 diff --git a/ray-operator/config/samples/ray-cluster.heterogeneous.yaml b/ray-operator/config/samples/ray-cluster.heterogeneous.yaml index 9c42268c3d..34a14f2a41 100644 --- a/ray-operator/config/samples/ray-cluster.heterogeneous.yaml +++ b/ray-operator/config/samples/ray-cluster.heterogeneous.yaml @@ -34,7 +34,7 @@ metadata: # An unique identifier for the head node and workers of this cluster. name: raycluster-heterogeneous spec: - rayVersion: '2.5.0' + rayVersion: '2.6.3' ######################headGroupSpecs################################# # Ray head pod template headGroupSpec: @@ -48,7 +48,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: "1" @@ -87,7 +87,7 @@ spec: spec: containers: - name: ray-worker # must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc' - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 volumeMounts: - mountPath: /tmp/ray name: ray-logs @@ -123,7 +123,7 @@ spec: spec: containers: - name: ray-worker # must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc' - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 # use volumeMounts.Optional. # Refer to https://kubernetes.io/docs/concepts/storage/volumes/ volumeMounts: diff --git a/ray-operator/config/samples/ray-cluster.mini.yaml b/ray-operator/config/samples/ray-cluster.mini.yaml index 1fa08fc71e..af91b82a36 100644 --- a/ray-operator/config/samples/ray-cluster.mini.yaml +++ b/ray-operator/config/samples/ray-cluster.mini.yaml @@ -10,7 +10,7 @@ metadata: # An unique identifier for the head node and workers of this cluster. name: raycluster-mini spec: - rayVersion: '2.5.0' # should match the Ray version in the image of the containers + rayVersion: '2.6.3' # should match the Ray version in the image of the containers # Ray head pod template headGroupSpec: # The `rayStartParams` are used to configure the `ray start` command. @@ -23,7 +23,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: 1 diff --git a/ray-operator/config/samples/ray-cluster.separate-ingress.yaml b/ray-operator/config/samples/ray-cluster.separate-ingress.yaml index 1daf41b01a..5e262b07b9 100644 --- a/ray-operator/config/samples/ray-cluster.separate-ingress.yaml +++ b/ray-operator/config/samples/ray-cluster.separate-ingress.yaml @@ -7,7 +7,7 @@ kind: RayCluster metadata: name: raycluster-ingress spec: - rayVersion: '2.5.0' # should match the Ray version in the image of the containers + rayVersion: '2.6.3' # should match the Ray version in the image of the containers headGroupSpec: serviceType: NodePort replicas: 1 @@ -21,7 +21,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: "1" diff --git a/ray-operator/config/samples/ray-cluster.tls.yaml b/ray-operator/config/samples/ray-cluster.tls.yaml index 7861a8fcce..6649cbae81 100644 --- a/ray-operator/config/samples/ray-cluster.tls.yaml +++ b/ray-operator/config/samples/ray-cluster.tls.yaml @@ -5,7 +5,7 @@ metadata: controller-tools.k8s.io: "1.0" name: raycluster-tls spec: - rayVersion: '2.5.0' + rayVersion: '2.6.3' # Note: Uncomment the `enableInTreeAutoscaling` and `autoscalerOptions` # if you wish to configure TLS for the autoscaler. @@ -54,7 +54,7 @@ spec: initContainers: # Generate head's private key and certificate before `ray start`. - name: ray-head-tls - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 command: ["/bin/sh", "-c", "cp -R /etc/ca/tls /etc/ray && /etc/gen/tls/gencert_head.sh"] volumeMounts: - mountPath: /etc/ca/tls @@ -71,7 +71,7 @@ spec: fieldPath: status.podIP containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 ports: - containerPort: 6379 name: gcs @@ -142,7 +142,7 @@ spec: initContainers: # Generate worker's private key and certificate before `ray start`. - name: ray-worker-tls - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 command: ["/bin/sh", "-c", "cp -R /etc/ca/tls /etc/ray && /etc/gen/tls/gencert_worker.sh"] volumeMounts: - mountPath: /etc/ca/tls @@ -159,7 +159,7 @@ spec: fieldPath: status.podIP containers: - name: ray-worker - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 lifecycle: preStop: exec: diff --git a/ray-operator/config/samples/ray-pod.tls.yaml b/ray-operator/config/samples/ray-pod.tls.yaml index 32b4cfe506..1982562c48 100644 --- a/ray-operator/config/samples/ray-pod.tls.yaml +++ b/ray-operator/config/samples/ray-pod.tls.yaml @@ -6,7 +6,7 @@ metadata: spec: containers: - name: client - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 args: [/bin/sh, -c, 'python -c "import ray; ray.init(\"ray://$FQ_RAY_IP:10001\"); print(ray.cluster_resources())" && sleep infinity'] env: - name: RAY_USE_TLS @@ -30,7 +30,7 @@ spec: name: gen-tls-script initContainers: - name: gen-cert - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 args: ["/bin/sh", "-c", "cp -R /etc/ca/tls /etc/ray && /etc/gen/tls/gencert_worker.sh"] volumeMounts: - mountPath: /etc/ca/tls diff --git a/ray-operator/config/samples/ray-service.autoscaler.yaml b/ray-operator/config/samples/ray-service.autoscaler.yaml index a06c4c4612..bee25504d3 100644 --- a/ray-operator/config/samples/ray-service.autoscaler.yaml +++ b/ray-operator/config/samples/ray-service.autoscaler.yaml @@ -40,7 +40,7 @@ spec: runtime_env: working_dir: "https://github.com/ray-project/test_dag/archive/041ac908e5a04ab50cb23d5939e53bd05a03e1ae.zip" rayClusterConfig: - rayVersion: '2.5.0' # should match the Ray version in the image of the containers + rayVersion: '2.6.3' # should match the Ray version in the image of the containers ## raycluster autoscaling config enableInTreeAutoscaling: true autoscalerOptions: @@ -64,7 +64,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: 2 @@ -97,7 +97,7 @@ spec: spec: containers: - name: ray-worker # must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc' - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 lifecycle: preStop: exec: diff --git a/ray-operator/config/samples/ray-service.custom-serve-service.yaml b/ray-operator/config/samples/ray-service.custom-serve-service.yaml index f99d47d005..5fbbe005e7 100644 --- a/ray-operator/config/samples/ray-service.custom-serve-service.yaml +++ b/ray-operator/config/samples/ray-service.custom-serve-service.yaml @@ -55,7 +55,7 @@ spec: rayActorOptions: numCpus: 0.1 rayClusterConfig: - rayVersion: '2.5.0' # should match the Ray version in the image of the containers + rayVersion: '2.6.3' # should match the Ray version in the image of the containers ######################headGroupSpecs################################# # Ray head pod template. headGroupSpec: @@ -69,7 +69,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: 2 @@ -102,7 +102,7 @@ spec: spec: containers: - name: ray-worker # must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc' - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 lifecycle: preStop: exec: diff --git a/ray-operator/config/samples/ray-service.different-port.yaml b/ray-operator/config/samples/ray-service.different-port.yaml index 7f3893aeef..b15536ebf3 100644 --- a/ray-operator/config/samples/ray-service.different-port.yaml +++ b/ray-operator/config/samples/ray-service.different-port.yaml @@ -43,7 +43,7 @@ spec: numCpus: 0.1 port: 9000 rayClusterConfig: - rayVersion: '2.5.0' # should match the Ray version in the image of the containers + rayVersion: '2.6.3' # should match the Ray version in the image of the containers ######################headGroupSpecs################################# # Ray head pod template. headGroupSpec: @@ -55,7 +55,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: 2 @@ -85,7 +85,7 @@ spec: spec: containers: - name: ray-worker # must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc' - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 lifecycle: preStop: exec: diff --git a/ray-operator/config/samples/ray-service.mobilenet.yaml b/ray-operator/config/samples/ray-service.mobilenet.yaml index cb5b8eb2b2..3a786ff2cb 100644 --- a/ray-operator/config/samples/ray-service.mobilenet.yaml +++ b/ray-operator/config/samples/ray-service.mobilenet.yaml @@ -13,7 +13,7 @@ spec: working_dir: "https://github.com/ray-project/serve_config_examples/archive/b393e77bbd6aba0881e3d94c05f968f05a387b96.zip" pip: ["python-multipart==0.0.6"] rayClusterConfig: - rayVersion: '2.5.0' # should match the Ray version in the image of the containers + rayVersion: '2.6.3' # should match the Ray version in the image of the containers ######################headGroupSpecs################################# # Ray head pod template. headGroupSpec: @@ -27,7 +27,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray-ml:2.5.0 + image: rayproject/ray-ml:2.6.3 resources: limits: cpu: 1 @@ -60,7 +60,7 @@ spec: spec: containers: - name: ray-worker # must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc' - image: rayproject/ray-ml:2.5.0 + image: rayproject/ray-ml:2.6.3 lifecycle: preStop: exec: diff --git a/ray-operator/config/samples/ray-service.stable-diffusion.yaml b/ray-operator/config/samples/ray-service.stable-diffusion.yaml index 1b00602a35..ea2caefada 100644 --- a/ray-operator/config/samples/ray-service.stable-diffusion.yaml +++ b/ray-operator/config/samples/ray-service.stable-diffusion.yaml @@ -13,7 +13,7 @@ spec: working_dir: "https://github.com/ray-project/serve_config_examples/archive/d6acf9b99ef076a1848f506670e1290a11654ec2.zip" pip: ["diffusers==0.12.1"] rayClusterConfig: - rayVersion: '2.5.0' # Should match the Ray version in the image of the containers + rayVersion: '2.6.3' # Should match the Ray version in the image of the containers ######################headGroupSpecs################################# # Ray head pod template. headGroupSpec: @@ -27,7 +27,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray-ml:2.5.0 + image: rayproject/ray-ml:2.6.3 ports: - containerPort: 6379 name: gcs @@ -62,7 +62,7 @@ spec: spec: containers: - name: ray-worker - image: rayproject/ray-ml:2.5.0 + image: rayproject/ray-ml:2.6.3 resources: limits: cpu: 4 diff --git a/ray-operator/config/samples/ray_v1alpha1_rayjob.shutdown.yaml b/ray-operator/config/samples/ray_v1alpha1_rayjob.shutdown.yaml index cddfb5a0e3..59f7edc92f 100644 --- a/ray-operator/config/samples/ray_v1alpha1_rayjob.shutdown.yaml +++ b/ray-operator/config/samples/ray_v1alpha1_rayjob.shutdown.yaml @@ -28,7 +28,7 @@ spec: # rayClusterSpec specifies the RayCluster instance to be created by the RayJob controller. rayClusterSpec: - rayVersion: '2.5.0' # should match the Ray version in the image of the containers + rayVersion: '2.6.3' # should match the Ray version in the image of the containers # Ray head pod template headGroupSpec: # The `rayStartParams` are used to configure the `ray start` command. @@ -41,7 +41,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 ports: - containerPort: 6379 name: gcs-server @@ -83,7 +83,7 @@ spec: spec: containers: - name: ray-worker # must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc' - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 lifecycle: preStop: exec: @@ -100,7 +100,7 @@ spec: # restartPolicy: Never # containers: # - name: my-custom-rayjob-submitter-pod - # image: rayproject/ray:2.5.0 + # image: rayproject/ray:2.6.3 # # If Command is not specified, the correct command will be supplied at runtime using the RayJob spec `entrypoint` field. # # Specifying Command is not recommended. # # command: ["ray job submit --address=http://rayjob-sample-raycluster-v6qcq-head-svc.default.svc.cluster.local:8265 -- echo hello world"] diff --git a/ray-operator/config/samples/ray_v1alpha1_rayjob.yaml b/ray-operator/config/samples/ray_v1alpha1_rayjob.yaml index 445ee6bf5f..019459b8a9 100644 --- a/ray-operator/config/samples/ray_v1alpha1_rayjob.yaml +++ b/ray-operator/config/samples/ray_v1alpha1_rayjob.yaml @@ -27,7 +27,7 @@ spec: # rayClusterSpec specifies the RayCluster instance to be created by the RayJob controller. rayClusterSpec: - rayVersion: '2.5.0' # should match the Ray version in the image of the containers + rayVersion: '2.6.3' # should match the Ray version in the image of the containers # Ray head pod template headGroupSpec: # The `rayStartParams` are used to configure the `ray start` command. @@ -40,7 +40,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 ports: - containerPort: 6379 name: gcs-server @@ -82,7 +82,7 @@ spec: spec: containers: - name: ray-worker # must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc' - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 lifecycle: preStop: exec: @@ -99,7 +99,7 @@ spec: # restartPolicy: Never # containers: # - name: my-custom-rayjob-submitter-pod - # image: rayproject/ray:2.5.0 + # image: rayproject/ray:2.6.3 # # If Command is not specified, the correct command will be supplied at runtime using the RayJob spec `entrypoint` field. # # Specifying Command is not recommended. # # command: ["ray job submit --address=http://rayjob-sample-raycluster-v6qcq-head-svc.default.svc.cluster.local:8265 -- echo hello world"] diff --git a/ray-operator/config/samples/ray_v1alpha1_rayservice.yaml b/ray-operator/config/samples/ray_v1alpha1_rayservice.yaml index a89a768bf9..b5fc6fa85b 100644 --- a/ray-operator/config/samples/ray_v1alpha1_rayservice.yaml +++ b/ray-operator/config/samples/ray_v1alpha1_rayservice.yaml @@ -70,7 +70,7 @@ spec: - name: DAGDriver num_replicas: 1 rayClusterConfig: - rayVersion: '2.5.0' # should match the Ray version in the image of the containers + rayVersion: '2.6.3' # should match the Ray version in the image of the containers ######################headGroupSpecs################################# # Ray head pod template. headGroupSpec: @@ -84,7 +84,7 @@ spec: spec: containers: - name: ray-head - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 resources: limits: cpu: 2 @@ -117,7 +117,7 @@ spec: spec: containers: - name: ray-worker # must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc' - image: rayproject/ray:2.5.0 + image: rayproject/ray:2.6.3 lifecycle: preStop: exec: diff --git a/ray-operator/controllers/ray/raycluster_controller_fake_test.go b/ray-operator/controllers/ray/raycluster_controller_fake_test.go index dc06c1f345..670bd97050 100644 --- a/ray-operator/controllers/ray/raycluster_controller_fake_test.go +++ b/ray-operator/controllers/ray/raycluster_controller_fake_test.go @@ -191,7 +191,7 @@ func setupTest(t *testing.T) { Containers: []corev1.Container{ { Name: "ray-worker", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Command: []string{"echo"}, Args: []string{"Hello Ray"}, }, @@ -215,7 +215,7 @@ func setupTest(t *testing.T) { Containers: []corev1.Container{ { Name: "ray-worker", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Command: []string{"echo"}, Args: []string{"Hello Ray"}, }, @@ -266,7 +266,7 @@ func setupTest(t *testing.T) { Containers: []corev1.Container{ { Name: "ray-head", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Command: []string{"python"}, Args: []string{"/opt/code.py"}, Env: []corev1.EnvVar{ @@ -299,7 +299,7 @@ func setupTest(t *testing.T) { Containers: []corev1.Container{ { Name: "ray-worker", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Command: []string{"echo"}, Args: []string{"Hello Ray"}, Env: []corev1.EnvVar{ diff --git a/ray-operator/controllers/ray/raycluster_controller_test.go b/ray-operator/controllers/ray/raycluster_controller_test.go index 8b1b7aad50..8fc18d0652 100644 --- a/ray-operator/controllers/ray/raycluster_controller_test.go +++ b/ray-operator/controllers/ray/raycluster_controller_test.go @@ -65,7 +65,7 @@ var _ = Context("Inside the default namespace", func() { Containers: []corev1.Container{ { Name: "ray-head", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Command: []string{"python"}, Args: []string{"/opt/code.py"}, Env: []corev1.EnvVar{ @@ -98,7 +98,7 @@ var _ = Context("Inside the default namespace", func() { Containers: []corev1.Container{ { Name: "ray-worker", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Command: []string{"echo"}, Args: []string{"Hello Ray"}, Env: []corev1.EnvVar{ diff --git a/ray-operator/controllers/ray/rayjob_controller_suspended_test.go b/ray-operator/controllers/ray/rayjob_controller_suspended_test.go index 74c9bc2eac..ebe95ee601 100644 --- a/ray-operator/controllers/ray/rayjob_controller_suspended_test.go +++ b/ray-operator/controllers/ray/rayjob_controller_suspended_test.go @@ -55,7 +55,7 @@ var _ = Context("Inside the default namespace", func() { Suspend: true, Entrypoint: "sleep 999", RayClusterSpec: &rayv1alpha1.RayClusterSpec{ - RayVersion: "2.5.0", + RayVersion: "2.6.3", HeadGroupSpec: rayv1alpha1.HeadGroupSpec{ ServiceType: corev1.ServiceTypeClusterIP, Replicas: pointer.Int32(1), diff --git a/ray-operator/controllers/ray/rayjob_controller_test.go b/ray-operator/controllers/ray/rayjob_controller_test.go index a75e04d0e6..4dd7ab125e 100644 --- a/ray-operator/controllers/ray/rayjob_controller_test.go +++ b/ray-operator/controllers/ray/rayjob_controller_test.go @@ -70,7 +70,7 @@ var myRayJob = &rayv1alpha1.RayJob{ Containers: []corev1.Container{ { Name: "ray-head", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Env: []corev1.EnvVar{ { Name: "MY_POD_IP", @@ -136,7 +136,7 @@ var myRayJob = &rayv1alpha1.RayJob{ Containers: []corev1.Container{ { Name: "ray-worker", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Command: []string{"echo"}, Args: []string{"Hello Ray"}, Env: []corev1.EnvVar{ diff --git a/ray-operator/controllers/ray/rayservice_controller_test.go b/ray-operator/controllers/ray/rayservice_controller_test.go index 9aa4f33b59..f3d0ba89f8 100644 --- a/ray-operator/controllers/ray/rayservice_controller_test.go +++ b/ray-operator/controllers/ray/rayservice_controller_test.go @@ -144,7 +144,7 @@ applications: Containers: []corev1.Container{ { Name: "ray-head", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Env: []corev1.EnvVar{ { Name: "MY_POD_IP", @@ -218,7 +218,7 @@ applications: Containers: []corev1.Container{ { Name: "ray-worker", - Image: "rayproject/ray:2.5.0", + Image: "rayproject/ray:2.6.3", Command: []string{"echo"}, Args: []string{"Hello Ray"}, Env: []corev1.EnvVar{ diff --git a/ray-operator/controllers/ray/rayservice_controller_unit_test.go b/ray-operator/controllers/ray/rayservice_controller_unit_test.go index b4fd67fd42..8f63b25d25 100644 --- a/ray-operator/controllers/ray/rayservice_controller_unit_test.go +++ b/ray-operator/controllers/ray/rayservice_controller_unit_test.go @@ -28,7 +28,7 @@ func TestGenerateRayClusterJsonHash(t *testing.T) { // `hash2` in this case. cluster := rayv1alpha1.RayCluster{ Spec: rayv1alpha1.RayClusterSpec{ - RayVersion: "2.5.0", + RayVersion: "2.6.3", WorkerGroupSpecs: []rayv1alpha1.WorkerGroupSpec{ { Template: corev1.PodTemplateSpec{ @@ -60,7 +60,7 @@ func TestGenerateRayClusterJsonHash(t *testing.T) { func TestCompareRayClusterJsonHash(t *testing.T) { cluster1 := rayv1alpha1.RayCluster{ Spec: rayv1alpha1.RayClusterSpec{ - RayVersion: "2.5.0", + RayVersion: "2.6.3", }, } cluster2 := cluster1.DeepCopy() diff --git a/tests/compatibility-test.py b/tests/compatibility-test.py index 35e8960b43..564bd3ebbe 100755 --- a/tests/compatibility-test.py +++ b/tests/compatibility-test.py @@ -31,10 +31,10 @@ ) # Default Ray version -ray_version = '2.5.0' +ray_version = '2.6.3' # Default docker images -ray_image = 'rayproject/ray:2.5.0' +ray_image = 'rayproject/ray:2.6.3' kuberay_operator_image = 'kuberay/operator:nightly' diff --git a/tests/test_sample_raycluster_yamls.py b/tests/test_sample_raycluster_yamls.py index d96bf22807..7476c89b2e 100644 --- a/tests/test_sample_raycluster_yamls.py +++ b/tests/test_sample_raycluster_yamls.py @@ -55,7 +55,7 @@ rs = RuleSet([HeadPodNameRule(), EasyJobRule(), HeadSvcRule()]) image_dict = { - CONST.RAY_IMAGE_KEY: os.getenv('RAY_IMAGE', default='rayproject/ray:2.5.0'), + CONST.RAY_IMAGE_KEY: os.getenv('RAY_IMAGE', default='rayproject/ray:2.6.3'), CONST.OPERATOR_IMAGE_KEY: os.getenv('OPERATOR_IMAGE', default='kuberay/operator:nightly'), } logger.info(image_dict) diff --git a/tests/test_sample_rayjob_yamls.py b/tests/test_sample_rayjob_yamls.py index 53139e1500..58497b9e10 100644 --- a/tests/test_sample_rayjob_yamls.py +++ b/tests/test_sample_rayjob_yamls.py @@ -38,7 +38,7 @@ # is only used to additionally check that the Ray Cluster remains alive and functional. rs = RuleSet([EasyJobRule(), ShutdownJobRule()]) image_dict = { - CONST.RAY_IMAGE_KEY: os.getenv('RAY_IMAGE', default='rayproject/ray:2.5.0'), + CONST.RAY_IMAGE_KEY: os.getenv('RAY_IMAGE', default='rayproject/ray:2.6.3'), CONST.OPERATOR_IMAGE_KEY: os.getenv('OPERATOR_IMAGE', default='kuberay/operator:nightly'), } logger.info(image_dict) diff --git a/tests/test_sample_rayservice_yamls.py b/tests/test_sample_rayservice_yamls.py index b3724fbee9..fee89aa111 100644 --- a/tests/test_sample_rayservice_yamls.py +++ b/tests/test_sample_rayservice_yamls.py @@ -35,7 +35,7 @@ NAMESPACE = 'default' DEFAULT_IMAGE_DICT = { - CONST.RAY_IMAGE_KEY: os.getenv('RAY_IMAGE', default='rayproject/ray:2.5.0'), + CONST.RAY_IMAGE_KEY: os.getenv('RAY_IMAGE', default='rayproject/ray:2.6.3'), CONST.OPERATOR_IMAGE_KEY: os.getenv('OPERATOR_IMAGE', default='kuberay/operator:nightly'), } diff --git a/tests/test_security.py b/tests/test_security.py index 7cd10c54f9..7a8794a70b 100644 --- a/tests/test_security.py +++ b/tests/test_security.py @@ -55,7 +55,7 @@ def setUpClass(cls): {PodSecurityTestCase.namespace}.kubernetes.io/enforce-version=latest") # Install the KubeRay operator in the namespace pod-security. image_dict = { - CONST.RAY_IMAGE_KEY: 'rayproject/ray-ml:2.5.0', + CONST.RAY_IMAGE_KEY: 'rayproject/ray-ml:2.6.3', CONST.OPERATOR_IMAGE_KEY: os.getenv('OPERATOR_IMAGE','kuberay/operator:nightly'), } logger.info(image_dict)