Skip to content

test #1

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.

Sign up for GitHub

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

Closed
pawelpaszki wants to merge 1 commit into from
Closed

test #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion demo-notebooks/additional-demos/local_interactive.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"\n",
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
"\n",
"- For Python 3.11: 'quay.io/modh/ray:2.44.1-py311-cu121'\n",
"- For Python 3.11: 'quay.io/modh/ray:2.46.0-py311-cu121'\n",
"\n",
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
]
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/additional-demos/ray_job_client.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"\n",
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
"\n",
"- For Python 3.11: 'quay.io/modh/ray:2.44.1-py311-cu121'\n",
"- For Python 3.11: 'quay.io/modh/ray:2.46.0-py311-cu121'\n",
"\n",
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
]
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/0_basic_ray.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"\n",
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
"\n",
"- For Python 3.11: 'quay.io/modh/ray:2.44.1-py311-cu121'\n",
"- For Python 3.11: 'quay.io/modh/ray:2.46.0-py311-cu121'\n",
"\n",
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
]
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/1_cluster_job_client.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"\n",
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
"\n",
"- For Python 3.11: 'quay.io/modh/ray:2.44.1-py311-cu121'\n",
"- For Python 3.11: 'quay.io/modh/ray:2.46.0-py311-cu121'\n",
"\n",
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
]
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/2_basic_interactive.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"\n",
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
"\n",
"- For Python 3.11: 'quay.io/modh/ray:2.44.1-py311-cu121'\n",
"- For Python 3.11: 'quay.io/modh/ray:2.46.0-py311-cu121'\n",
"\n",
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
]
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/3_widget_example.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"\n",
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
"\n",
"- For Python 3.11: 'quay.io/modh/ray:2.44.1-py311-cu121'\n",
"- For Python 3.11: 'quay.io/modh/ray:2.46.0-py311-cu121'\n",
"\n",
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
]
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/notebook-ex-outputs/0_basic_ray.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"\n",
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
"\n",
"- For Python 3.11: 'quay.io/modh/ray:2.44.1-py311-cu121'\n",
"- For Python 3.11: 'quay.io/modh/ray:2.46.0-py311-cu121'\n",
"\n",
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
]
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/notebook-ex-outputs/1_cluster_job_client.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"\n",
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
"\n",
"- For Python 3.11: 'quay.io/modh/ray:2.44.1-py311-cu121'\n",
"- For Python 3.11: 'quay.io/modh/ray:2.46.0-py311-cu121'\n",
"\n",
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
]
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/notebook-ex-outputs/2_basic_interactive.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"\n",
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
"\n",
"- For Python 3.11: 'quay.io/modh/ray:2.44.1-py311-cu121'\n",
"- For Python 3.11: 'quay.io/modh/ray:2.46.0-py311-cu121'\n",
"\n",
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
]
Expand Down
4 changes: 2 additions & 2 deletions demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ spec:
value: /home/ray/workspace/tls/server.key
- name: RAY_TLS_CA_CERT
value: /home/ray/workspace/tls/ca.crt
image: quay.io/modh/ray:2.44.1-py311-cu121
image: quay.io/modh/ray:2.46.0-py311-cu121
imagePullPolicy: Always
lifecycle:
preStop:
Expand Down Expand Up @@ -147,7 +147,7 @@ spec:
value: /home/ray/workspace/tls/server.key
- name: RAY_TLS_CA_CERT
value: /home/ray/workspace/tls/ca.crt
image: quay.io/modh/ray:2.44.1-py311-cu121
image: quay.io/modh/ray:2.46.0-py311-cu121
lifecycle:
preStop:
exec:
Expand Down
4 changes: 2 additions & 2 deletions demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ spec:
value: /home/ray/workspace/tls/server.key
- name: RAY_TLS_CA_CERT
value: /home/ray/workspace/tls/ca.crt
image: quay.io/modh/ray:2.44.1-py311-cu121
image: quay.io/modh/ray:2.46.0-py311-cu121
imagePullPolicy: Always
lifecycle:
preStop:
Expand Down Expand Up @@ -127,7 +127,7 @@ spec:
value: /home/ray/workspace/tls/server.key
- name: RAY_TLS_CA_CERT
value: /home/ray/workspace/tls/ca.crt
image: quay.io/modh/ray:2.44.1-py311-cu121
image: quay.io/modh/ray:2.46.0-py311-cu121
lifecycle:
preStop:
exec:
Expand Down
4 changes: 2 additions & 2 deletions demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ spec:
value: /home/ray/workspace/tls/server.key
- name: RAY_TLS_CA_CERT
value: /home/ray/workspace/tls/ca.crt
image: quay.io/modh/ray:2.44.1-py311-cu121
image: quay.io/modh/ray:2.46.0-py311-cu121
imagePullPolicy: Always
lifecycle:
preStop:
Expand Down Expand Up @@ -127,7 +127,7 @@ spec:
value: /home/ray/workspace/tls/server.key
- name: RAY_TLS_CA_CERT
value: /home/ray/workspace/tls/ca.crt
image: quay.io/modh/ray:2.44.1-py311-cu121
image: quay.io/modh/ray:2.46.0-py311-cu121
lifecycle:
preStop:
exec:
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/preview_nbs/0_basic_ray.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"\n",
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
"\n",
"- For Python 3.11: 'quay.io/modh/ray:2.44.1-py311-cu121'\n",
"- For Python 3.11: 'quay.io/modh/ray:2.46.0-py311-cu121'\n",
"\n",
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
]
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/preview_nbs/1_cluster_job_client.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"\n",
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
"\n",
"- For Python 3.11: 'quay.io/modh/ray:2.44.1-py311-cu121'\n",
"- For Python 3.11: 'quay.io/modh/ray:2.46.0-py311-cu121'\n",
"\n",
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
]
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/preview_nbs/2_basic_interactive.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"\n",
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
"\n",
"- For Python 3.11: 'quay.io/modh/ray:2.44.1-py311-cu121'\n",
"- For Python 3.11: 'quay.io/modh/ray:2.46.0-py311-cu121'\n",
"\n",
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
]
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/user-docs/cluster-configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ requirements for creating the Ray Cluster.
The default images used by the CodeFlare SDK for creating
a RayCluster resource depend on the installed Python version:

- For Python 3.11: `quay.io/modh/ray:2.44.1-py311-cu121`
- For Python 3.11: `quay.io/modh/ray:2.46.0-py311-cu121`

If you prefer to use a custom Ray image that better suits your
needs, you can specify it in the image field to override the default.
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ keywords = ['codeflare', 'python', 'sdk', 'client', 'batch', 'scale']
python = "^3.11"
openshift-client = "1.0.18"
rich = ">=12.5,<14.0"
ray = {version = "2.44.1", extras = ["data", "default"]}
ray = {version = "2.46.0", extras = ["data", "default"]}
kubernetes = ">= 27.2.0"
cryptography = "43.0.3"
executing = "1.2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/codeflare_sdk/common/utils/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RAY_VERSION = "2.44.1"
RAY_VERSION = "2.46.0"
4 changes: 2 additions & 2 deletions src/codeflare_sdk/common/utils/unit_test_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def create_cluster_wrong_type():
worker_extended_resource_requests={"nvidia.com/gpu": 7},
appwrapper=True,
image_pull_secrets=["unit-test-pull-secret"],
image="quay.io/modh/ray@sha256:ac401c35d29cbd920ef982775f20e86d948b81eb67e83adbbbba8b29ad33ca31",
image="quay.io/modh/ray@sha256:a5b7c04a14f180d7ca6d06a5697f6bb684e40a26b95a0c872cac23b552741707",
write_to_file=True,
labels={1: 1},
)
Expand Down Expand Up @@ -275,7 +275,7 @@ def apply_template(yaml_file_path, variables):
def get_expected_image():
# TODO: Add Python 3.12 support
python_version = sys.version_info
return "quay.io/modh/ray@sha256:ac401c35d29cbd920ef982775f20e86d948b81eb67e83adbbbba8b29ad33ca31"
return "quay.io/modh/ray@sha256:a5b7c04a14f180d7ca6d06a5697f6bb684e40a26b95a0c872cac23b552741707"


def get_template_variables():
Expand Down
2 changes: 1 addition & 1 deletion src/codeflare_sdk/ray/cluster/build_ray_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
]

SUPPORTED_PYTHON_VERSIONS = {
"3.11": "quay.io/modh/ray@sha256:ac401c35d29cbd920ef982775f20e86d948b81eb67e83adbbbba8b29ad33ca31",
"3.11": "quay.io/modh/ray@sha256:a5b7c04a14f180d7ca6d06a5697f6bb684e40a26b95a0c872cac23b552741707",
}


Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def get_ray_cluster(cluster_name, namespace):


def get_ray_image():
default_ray_image = "quay.io/modh/ray@sha256:ac401c35d29cbd920ef982775f20e86d948b81eb67e83adbbbba8b29ad33ca31"
default_ray_image = "quay.io/modh/ray@sha256:a5b7c04a14f180d7ca6d06a5697f6bb684e40a26b95a0c872cac23b552741707"
return os.getenv("RAY_IMAGE", default_ray_image)


Expand Down
6 changes: 3 additions & 3 deletions tests/test_cluster_yamls/appwrapper/test-case-bad.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay.io/modh/ray@sha256:ac401c35d29cbd920ef982775f20e86d948b81eb67e83adbbbba8b29ad33ca31
image: quay.io/modh/ray@sha256:a5b7c04a14f180d7ca6d06a5697f6bb684e40a26b95a0c872cac23b552741707
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand All @@ -66,7 +66,7 @@ spec:
requests:
cpu: 2
memory: 8G
rayVersion: 2.44.1
rayVersion: 2.46.0
workerGroupSpecs:
- groupName: small-group-unit-test-cluster
maxReplicas: 2
Expand All @@ -89,7 +89,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay.io/modh/ray@sha256:ac401c35d29cbd920ef982775f20e86d948b81eb67e83adbbbba8b29ad33ca31
image: quay.io/modh/ray@sha256:a5b7c04a14f180d7ca6d06a5697f6bb684e40a26b95a0c872cac23b552741707
lifecycle:
preStop:
exec:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cluster_yamls/appwrapper/unit-test-all-params.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ spec:
name: odh-trusted-ca-bundle
optional: true
name: odh-ca-cert
rayVersion: 2.44.1
rayVersion: 2.46.0
workerGroupSpecs:
- groupName: small-group-aw-all-params
maxReplicas: 10
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cluster_yamls/kueue/aw_kueue.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ spec:
name: odh-trusted-ca-bundle
optional: true
name: odh-ca-cert
rayVersion: 2.44.1
rayVersion: 2.46.0
workerGroupSpecs:
- groupName: small-group-unit-test-aw-kueue
maxReplicas: 2
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cluster_yamls/kueue/ray_cluster_kueue.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ spec:
name: odh-trusted-ca-bundle
optional: true
name: odh-ca-cert
rayVersion: 2.44.1
rayVersion: 2.46.0
workerGroupSpecs:
- groupName: small-group-unit-test-cluster-kueue
maxReplicas: 2
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cluster_yamls/ray/default-appwrapper.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
name: odh-trusted-ca-bundle
optional: true
name: odh-ca-cert
rayVersion: 2.44.1
rayVersion: 2.46.0
workerGroupSpecs:
- groupName: small-group-default-appwrapper
maxReplicas: 1
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cluster_yamls/ray/default-ray-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ spec:
name: odh-trusted-ca-bundle
optional: true
name: odh-ca-cert
rayVersion: 2.44.1
rayVersion: 2.46.0
workerGroupSpecs:
- groupName: small-group-default-cluster
maxReplicas: 1
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cluster_yamls/ray/unit-test-all-params.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ spec:
name: odh-trusted-ca-bundle
optional: true
name: odh-ca-cert
rayVersion: 2.44.1
rayVersion: 2.46.0
workerGroupSpecs:
- groupName: small-group-test-all-params
maxReplicas: 10
Expand Down
6 changes: 3 additions & 3 deletions tests/test_cluster_yamls/support_clusters/test-aw-a.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
template:
spec:
containers:
- image: quay.io/modh/ray@sha256:ac401c35d29cbd920ef982775f20e86d948b81eb67e83adbbbba8b29ad33ca31
- image: quay.io/modh/ray@sha256:a5b7c04a14f180d7ca6d06a5697f6bb684e40a26b95a0c872cac23b552741707
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -91,7 +91,7 @@ spec:
name: odh-trusted-ca-bundle
optional: true
name: odh-ca-cert
rayVersion: 2.44.1
rayVersion: 2.46.0
workerGroupSpecs:
- groupName: small-group-test-cluster-a
maxReplicas: 1
Expand All @@ -109,7 +109,7 @@ spec:
key: value
spec:
containers:
- image: quay.io/modh/ray@sha256:ac401c35d29cbd920ef982775f20e86d948b81eb67e83adbbbba8b29ad33ca31
- image: quay.io/modh/ray@sha256:a5b7c04a14f180d7ca6d06a5697f6bb684e40a26b95a0c872cac23b552741707
lifecycle:
preStop:
exec:
Expand Down
6 changes: 3 additions & 3 deletions tests/test_cluster_yamls/support_clusters/test-aw-b.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
template:
spec:
containers:
- image: quay.io/modh/ray@sha256:ac401c35d29cbd920ef982775f20e86d948b81eb67e83adbbbba8b29ad33ca31
- image: quay.io/modh/ray@sha256:a5b7c04a14f180d7ca6d06a5697f6bb684e40a26b95a0c872cac23b552741707
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -91,7 +91,7 @@ spec:
name: odh-trusted-ca-bundle
optional: true
name: odh-ca-cert
rayVersion: 2.44.1
rayVersion: 2.46.0
workerGroupSpecs:
- groupName: small-group-test-cluster-b
maxReplicas: 1
Expand All @@ -109,7 +109,7 @@ spec:
key: value
spec:
containers:
- image: quay.io/modh/ray@sha256:ac401c35d29cbd920ef982775f20e86d948b81eb67e83adbbbba8b29ad33ca31
- image: quay.io/modh/ray@sha256:a5b7c04a14f180d7ca6d06a5697f6bb684e40a26b95a0c872cac23b552741707
lifecycle:
preStop:
exec:
Expand Down
6 changes: 3 additions & 3 deletions tests/test_cluster_yamls/support_clusters/test-rc-a.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
template:
spec:
containers:
- image: quay.io/modh/ray@sha256:ac401c35d29cbd920ef982775f20e86d948b81eb67e83adbbbba8b29ad33ca31
- image: quay.io/modh/ray@sha256:a5b7c04a14f180d7ca6d06a5697f6bb684e40a26b95a0c872cac23b552741707
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down Expand Up @@ -82,7 +82,7 @@ spec:
name: odh-trusted-ca-bundle
optional: true
name: odh-ca-cert
rayVersion: 2.44.1
rayVersion: 2.46.0
workerGroupSpecs:
- groupName: small-group-test-cluster-a
maxReplicas: 1
Expand All @@ -100,7 +100,7 @@ spec:
key: value
spec:
containers:
- image: quay.io/modh/ray@sha256:ac401c35d29cbd920ef982775f20e86d948b81eb67e83adbbbba8b29ad33ca31
- image: quay.io/modh/ray@sha256:a5b7c04a14f180d7ca6d06a5697f6bb684e40a26b95a0c872cac23b552741707
lifecycle:
preStop:
exec:
Expand Down
Loading
Loading