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

[Ray 2.3.0] Update --redis-password for RayCluster #929

Merged
merged 3 commits into from
Feb 25, 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
6 changes: 3 additions & 3 deletions .github/workflows/test-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -360,13 +360,13 @@ jobs:
with:
ray_version: nightly

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

15 changes: 9 additions & 6 deletions ray-operator/config/samples/ray-cluster.external-redis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,23 @@ 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
rayStartParams:
dashboard-host: '0.0.0.0'
num-cpus: '1' # can be auto-completed from the limits
block: 'true'
dashboard-host: "0.0.0.0"
num-cpus: "1" # can be auto-completed from the limits
block: "true"
# redis-password should match "requirepass" in redis.conf in the ConfigMap above.
# Ray 2.3.0 changes the default redis password from "5241590000000000" to "".
redis-password: "5241590000000000"
#pod template
template:
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 +131,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/security/ray-cluster.pod-security.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
spec:
containers:
- name: ray-head
image: rayproject/ray-ml:2.2.0
image: rayproject/ray-ml:2.3.0
ports:
- containerPort: 6379
name: gcs
Expand Down Expand Up @@ -91,7 +91,7 @@ spec:
spec:
containers:
- name: ray-worker
image: rayproject/ray-ml:2.2.0
image: rayproject/ray-ml:2.3.0
# environment variables to set in the container.Optional.
# Refer to https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/
lifecycle:
Expand Down
4 changes: 2 additions & 2 deletions tests/compatibility-test.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
)

# Default Ray version
ray_version = '2.2.0'
ray_version = '2.3.0'

# Default docker images
ray_image = 'rayproject/ray:2.2.0'
ray_image = 'rayproject/ray:2.3.0'
kuberay_operator_image = 'kuberay/operator:nightly'


Expand Down
7 changes: 4 additions & 3 deletions tests/config/ray-cluster.ray-ft.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ spec:
rayVersion: '$ray_version'
headGroupSpec:
rayStartParams:
dashboard-host: '0.0.0.0'
num-cpus: '1'
block: 'true'
dashboard-host: "0.0.0.0"
num-cpus: "1"
block: "true"
redis-password: "5241590000000000"
#pod template
template:
metadata:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_sample_raycluster_yamls.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

rs = RuleSet([HeadPodNameRule(), EasyJobRule(), HeadSvcRule()])
image_dict = {
CONST.RAY_IMAGE_KEY: os.getenv('RAY_IMAGE', default='rayproject/ray:2.2.0'),
CONST.RAY_IMAGE_KEY: os.getenv('RAY_IMAGE', default='rayproject/ray:2.3.0'),
CONST.OPERATOR_IMAGE_KEY: os.getenv('OPERATOR_IMAGE', default='kuberay/operator:nightly'),
}
logger.info(image_dict)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_sample_rayservice_yamls.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

rs = RuleSet([EasyJobRule(), CurlServiceRule()])
image_dict = {
CONST.RAY_IMAGE_KEY: os.getenv('RAY_IMAGE', default='rayproject/ray:2.2.0'),
CONST.RAY_IMAGE_KEY: os.getenv('RAY_IMAGE', default='rayproject/ray:2.3.0'),
CONST.OPERATOR_IMAGE_KEY: os.getenv('OPERATOR_IMAGE', default='kuberay/operator:nightly'),
}
logger.info(image_dict)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_security.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0',
CONST.RAY_IMAGE_KEY: 'rayproject/ray-ml:2.3.0',
CONST.OPERATOR_IMAGE_KEY: os.getenv('OPERATOR_IMAGE','kuberay/operator:nightly'),
}
logger.info(image_dict)
Expand Down