Skip to content

Commit a0158e1

Browse files
MortalHappinessrueian
authored andcommitted
[Test][KubeRay] Update KubeRay version to v1.4.0 for autoscaler tests (#53974)
Signed-off-by: Chi-Sheng Liu <chishengliu@chishengliu.com> Signed-off-by: Rueian <rueiancsie@gmail.com> Co-authored-by: Rueian <rueiancsie@gmail.com> Signed-off-by: elliot-barn <elliot.barnwell@anyscale.com>
1 parent b06eca8 commit a0158e1

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

ci/k8s/run-operator-tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ kind load docker-image ray-ci:kuberay-test
1717
# python python/ray/tests/kuberay/setup/setup_kuberay.py
1818

1919
bash python/ray/autoscaler/kuberay/init-config.sh
20+
kubectl create namespace kuberay-system
2021
kubectl create -k python/ray/autoscaler/kuberay/config/default
2122

2223
echo "--- Test ray cluster creation"

python/ray/autoscaler/kuberay/init-config.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -euo pipefail
44

55
# Clone pinned KubeRay commit to temporary directory, copy the CRD definitions
66
# into the autoscaler folder.
7-
KUBERAY_BRANCH="v1.2.2"
8-
OPERATOR_TAG="v1.2.2"
7+
KUBERAY_BRANCH="v1.4.0"
8+
OPERATOR_TAG="v1.4.0"
99

1010
# Requires Kustomize
1111
if ! command -v kustomize &> /dev/null
@@ -24,6 +24,7 @@ DIR=$(mktemp -d -t "kuberay-XXXXXX")
2424
(
2525
cd kuberay/ray-operator/config/default
2626
kustomize edit set image kuberay/operator=quay.io/kuberay/operator:"$OPERATOR_TAG"
27+
kustomize edit set namespace kuberay-system
2728
)
2829
cp -r kuberay/ray-operator/config "$SCRIPT_DIR/"
2930
)

python/ray/tests/kuberay/test_files/ray-cluster.autoscaler-template.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
name: raycluster-autoscaler
1010
spec:
1111
# The version of Ray you are using. Make sure all Ray containers are running this version of Ray.
12-
rayVersion: '2.7.0'
12+
rayVersion: '2.46.0'
1313
# If `enableInTreeAutoscaling` is true, the Autoscaler sidecar will be added to the Ray head pod.
1414
# Ray Autoscaler integration is Beta with KubeRay >= 0.3.0 and Ray >= 2.0.0.
1515
enableInTreeAutoscaling: true
@@ -30,7 +30,7 @@ spec:
3030
spec:
3131
containers:
3232
- name: ray-head
33-
image: rayproject/ray:2.7.0
33+
image: rayproject/ray:2.46.0
3434
ports:
3535
- containerPort: 6379
3636
name: gcs
@@ -60,7 +60,7 @@ spec:
6060
spec:
6161
containers:
6262
- name: ray-worker
63-
image: rayproject/ray:2.7.0
63+
image: rayproject/ray:2.46.0
6464
lifecycle:
6565
preStop:
6666
exec:

python/ray/tests/kuberay/test_files/ray-cluster.autoscaler-v2-template.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ metadata:
77
name: raycluster-autoscaler
88
spec:
99
# The version of Ray you are using. Make sure all Ray containers are running this version of Ray.
10-
rayVersion: '2.7.0'
10+
rayVersion: '2.46.0'
1111
# If `enableInTreeAutoscaling` is true, the Autoscaler sidecar will be added to the Ray head pod.
1212
# Ray Autoscaler integration is Beta with KubeRay >= 0.3.0 and Ray >= 2.0.0.
1313
enableInTreeAutoscaling: true
1414
autoscalerOptions:
1515
# Use version: v2 instead of env var RAY_enable_autoscaler_v2 and restartPolicy: Never below if
1616
# you're using KubeRay >= 1.4.0.
17-
# version: v2
17+
version: v2
1818
upscalingMode: Default
1919
idleTimeoutSeconds: 60
2020
imagePullPolicy: IfNotPresent
@@ -31,7 +31,7 @@ spec:
3131
spec:
3232
containers:
3333
- name: ray-head
34-
image: rayproject/ray:2.7.0
34+
image: rayproject/ray:2.46.0
3535
ports:
3636
- containerPort: 6379
3737
name: gcs
@@ -51,9 +51,6 @@ spec:
5151
requests:
5252
cpu: "500m"
5353
memory: "2G"
54-
env:
55-
- name: RAY_enable_autoscaler_v2 # Pass env var for the autoscaler v2.
56-
value: "1"
5754
restartPolicy: Never # No restart to avoid reuse of pod for different ray nodes.
5855
workerGroupSpecs:
5956
- replicas: 1
@@ -65,7 +62,7 @@ spec:
6562
spec:
6663
containers:
6764
- name: ray-worker
68-
image: rayproject/ray:2.7.0
65+
image: rayproject/ray:2.46.0
6966
lifecycle:
7067
preStop:
7168
exec:

release/k8s_tests/run_gcs_ft_on_k8s.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def generate_cluster_variable():
5151

5252
def check_kuberay_installed():
5353
# Make sure the ray namespace exists
54-
KUBERAY_VERSION = "v1.2.2"
54+
KUBERAY_VERSION = "v1.4.0"
5555
uri = (
5656
"github.com/ray-project/kuberay/manifests"
5757
f"/base?ref={KUBERAY_VERSION}&timeout=90s"

0 commit comments

Comments
 (0)