Skip to content

Commit c51ab98

Browse files
Bobbins228openshift-merge-bot[bot]
Bobbins228
authored and
openshift-merge-bot[bot]
committed
Replaced old ray image with new 2.20.0 image
1 parent b3950fc commit c51ab98

9 files changed

+24
-24
lines changed

‎src/codeflare_sdk/templates/base-template.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ spec:
6969
containers:
7070
# The Ray head pod
7171
- name: ray-head
72-
image: quay.io/project-codeflare/ray:latest-py39-cu118
72+
image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
7373
imagePullPolicy: Always
7474
ports:
7575
- containerPort: 6379
@@ -152,7 +152,7 @@ spec:
152152
spec:
153153
containers:
154154
- name: machine-learning # must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc'
155-
image: quay.io/project-codeflare/ray:latest-py39-cu118
155+
image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
156156
# environment variables to set in the container.Optional.
157157
# Refer to https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/
158158
lifecycle:

‎tests/e2e/support.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
def get_ray_image():
11-
default_ray_image = "quay.io/project-codeflare/ray:latest-py39-cu118"
11+
default_ray_image = "quay.io/project-codeflare/ray:2.20.0-py39-cu118"
1212
return os.getenv("RAY_IMAGE", default_ray_image)
1313

1414

‎tests/test-case-bad.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
valueFrom:
4343
fieldRef:
4444
fieldPath: status.podIP
45-
image: quay.io/project-codeflare/ray:latest-py39-cu118
45+
image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
4646
imagePullPolicy: Always
4747
lifecycle:
4848
preStop:
@@ -90,7 +90,7 @@ spec:
9090
valueFrom:
9191
fieldRef:
9292
fieldPath: status.podIP
93-
image: quay.io/project-codeflare/ray:latest-py39-cu118
93+
image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
9494
lifecycle:
9595
preStop:
9696
exec:

‎tests/test-case-no-mcad.yamls

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
template:
3434
spec:
3535
containers:
36-
- image: quay.io/project-codeflare/ray:latest-py39-cu118
36+
- image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
3737
imagePullPolicy: Always
3838
lifecycle:
3939
preStop:
@@ -106,7 +106,7 @@ spec:
106106
key: value
107107
spec:
108108
containers:
109-
- image: quay.io/project-codeflare/ray:latest-py39-cu118
109+
- image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
110110
lifecycle:
111111
preStop:
112112
exec:

‎tests/test-case.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
template:
3939
spec:
4040
containers:
41-
- image: quay.io/project-codeflare/ray:latest-py39-cu118
41+
- image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
4242
imagePullPolicy: Always
4343
lifecycle:
4444
preStop:
@@ -111,7 +111,7 @@ spec:
111111
key: value
112112
spec:
113113
containers:
114-
- image: quay.io/project-codeflare/ray:latest-py39-cu118
114+
- image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
115115
lifecycle:
116116
preStop:
117117
exec:

‎tests/test-default-appwrapper.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
template:
3939
spec:
4040
containers:
41-
- image: quay.io/project-codeflare/ray:latest-py39-cu118
41+
- image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
4242
imagePullPolicy: Always
4343
lifecycle:
4444
preStop:
@@ -110,7 +110,7 @@ spec:
110110
key: value
111111
spec:
112112
containers:
113-
- image: quay.io/project-codeflare/ray:latest-py39-cu118
113+
- image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
114114
lifecycle:
115115
preStop:
116116
exec:

‎tests/unit-test-volume-cluster.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
template:
3030
spec:
3131
containers:
32-
- image: quay.io/project-codeflare/ray:latest-py39-cu118
32+
- image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
3333
imagePullPolicy: Always
3434
lifecycle:
3535
preStop:
@@ -102,7 +102,7 @@ spec:
102102
- name: test3
103103
secret:
104104
secretName: test-secret
105-
rayVersion: 2.7.0
105+
rayVersion: 2.20.0
106106
workerGroupSpecs:
107107
- groupName: small-group-unit-test-volume-cluster
108108
maxReplicas: 1
@@ -119,7 +119,7 @@ spec:
119119
key: value
120120
spec:
121121
containers:
122-
- image: quay.io/project-codeflare/ray:latest-py39-cu118
122+
- image: quay.io/project-codeflare/ray:2.20.0-py39-cu118
123123
lifecycle:
124124
preStop:
125125
exec:

‎tests/unit_test.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ def test_config_creation():
261261
assert config.min_cpus == 3 and config.max_cpus == 4
262262
assert config.min_memory == "5G" and config.max_memory == "6G"
263263
assert config.num_gpus == 7
264-
assert config.image == "quay.io/project-codeflare/ray:latest-py39-cu118"
264+
assert config.image == "quay.io/project-codeflare/ray:2.20.0-py39-cu118"
265265
assert config.template == f"{parent}/src/codeflare_sdk/templates/base-template.yaml"
266266
assert config.machine_types == ["cpu.small", "gpu.large"]
267267
assert config.image_pull_secrets == ["unit-test-pull-secret"]
@@ -400,7 +400,7 @@ def test_cluster_creation_no_mcad_local_queue(mocker):
400400
num_gpus=7,
401401
machine_types=["cpu.small", "gpu.large"],
402402
image_pull_secrets=["unit-test-pull-secret"],
403-
image="quay.io/project-codeflare/ray:latest-py39-cu118",
403+
image="quay.io/project-codeflare/ray:2.20.0-py39-cu118",
404404
write_to_file=True,
405405
appwrapper=False,
406406
local_queue="local-queue-default",
@@ -428,7 +428,7 @@ def test_default_cluster_creation(mocker):
428428
)
429429
default_config = ClusterConfiguration(
430430
name="unit-test-default-cluster",
431-
image="quay.io/project-codeflare/ray:latest-py39-cu118",
431+
image="quay.io/project-codeflare/ray:2.20.0-py39-cu118",
432432
appwrapper=True,
433433
)
434434
cluster = Cluster(default_config)
@@ -493,7 +493,7 @@ def test_cluster_with_custom_volumes(mocker):
493493

494494
test_config = ClusterConfiguration(
495495
name="unit-test-volume-cluster",
496-
image="quay.io/project-codeflare/ray:latest-py39-cu118",
496+
image="quay.io/project-codeflare/ray:2.20.0-py39-cu118",
497497
volume_mounts=volume_mounts,
498498
volumes=volumes,
499499
)
@@ -839,7 +839,7 @@ def test_ray_job_wrapping(mocker):
839839
return_value=get_local_queue("kueue.x-k8s.io", "v1beta1", "ns", "localqueues"),
840840
)
841841
cluster = cluster = createClusterWithConfig(mocker)
842-
cluster.config.image = "quay.io/project-codeflare/ray:latest-py39-cu118"
842+
cluster.config.image = "quay.io/project-codeflare/ray:2.20.0-py39-cu118"
843843
mocker.patch(
844844
"ray.job_submission.JobSubmissionClient._check_connection_and_version_with_url",
845845
return_value="None",
@@ -959,7 +959,7 @@ def test_ray_details(mocker, capsys):
959959
ClusterConfiguration(
960960
name="raytest2",
961961
namespace="ns",
962-
image="quay.io/project-codeflare/ray:latest-py39-cu118",
962+
image="quay.io/project-codeflare/ray:2.20.0-py39-cu118",
963963
write_to_file=True,
964964
appwrapper=True,
965965
local_queue="local_default_queue",
@@ -2352,7 +2352,7 @@ def test_cluster_status(mocker):
23522352
ClusterConfiguration(
23532353
name="test",
23542354
namespace="ns",
2355-
image="quay.io/project-codeflare/ray:latest-py39-cu118",
2355+
image="quay.io/project-codeflare/ray:2.20.0-py39-cu118",
23562356
write_to_file=True,
23572357
appwrapper=True,
23582358
local_queue="local_default_queue",
@@ -2447,7 +2447,7 @@ def test_wait_ready(mocker, capsys):
24472447
ClusterConfiguration(
24482448
name="test",
24492449
namespace="ns",
2450-
image="quay.io/project-codeflare/ray:latest-py39-cu118",
2450+
image="quay.io/project-codeflare/ray:2.20.0-py39-cu118",
24512451
write_to_file=True,
24522452
appwrapper=True,
24532453
local_queue="local-queue-default",
@@ -2674,7 +2674,7 @@ def throw_if_getting_raycluster(group, version, namespace, plural):
26742674
cluster = Cluster(
26752675
ClusterConfiguration(
26762676
"test_cluster",
2677-
image="quay.io/project-codeflare/ray:latest-py39-cu118",
2677+
image="quay.io/project-codeflare/ray:2.20.0-py39-cu118",
26782678
write_to_file=False,
26792679
)
26802680
)

‎tests/unit_test_support.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def createClusterConfig():
1717
appwrapper=True,
1818
machine_types=["cpu.small", "gpu.large"],
1919
image_pull_secrets=["unit-test-pull-secret"],
20-
image="quay.io/project-codeflare/ray:latest-py39-cu118",
20+
image="quay.io/project-codeflare/ray:2.20.0-py39-cu118",
2121
write_to_file=True,
2222
)
2323
return config

0 commit comments

Comments
 (0)