diff --git a/charts/qiskit-serverless/Chart.lock b/charts/qiskit-serverless/Chart.lock index affc4ddc3..6cfac6c55 100644 --- a/charts/qiskit-serverless/Chart.lock +++ b/charts/qiskit-serverless/Chart.lock @@ -1,7 +1,7 @@ dependencies: - name: gateway repository: "" - version: 0.14.0 + version: 0.14.1 - name: nginx-ingress-controller repository: https://charts.bitnami.com/bitnami version: 9.11.0 @@ -11,5 +11,5 @@ dependencies: - name: kuberay-operator repository: https://ray-project.github.io/kuberay-helm version: 1.1.1 -digest: sha256:21bc630a23c9ba56029944e630208ceeb81191e064e004fe4fee91e4b496cfef -generated: "2024-07-17T21:37:54.223878815Z" +digest: sha256:43d30e0ff94d7453702f4de3d1efc3eea782d3ec45d7594c560e3e6d3675aa76 +generated: "2024-07-29T11:10:24.552213-04:00" diff --git a/charts/qiskit-serverless/Chart.yaml b/charts/qiskit-serverless/Chart.yaml index 54b3dc4aa..7c29faf39 100644 --- a/charts/qiskit-serverless/Chart.yaml +++ b/charts/qiskit-serverless/Chart.yaml @@ -4,13 +4,13 @@ description: Qiskit-Serverless helm chart that contains different dependencies. type: application -version: 0.14.0 -appVersion: "0.14.0" +version: 0.14.1 +appVersion: "0.14.1" dependencies: - name: gateway condition: gatewayEnable - version: 0.14.0 + version: 0.14.1 - name: nginx-ingress-controller condition: nginxIngressControllerEnable version: 9.11.0 diff --git a/charts/qiskit-serverless/charts/gateway/Chart.yaml b/charts/qiskit-serverless/charts/gateway/Chart.yaml index 848e56e1a..010195f65 100644 --- a/charts/qiskit-serverless/charts/gateway/Chart.yaml +++ b/charts/qiskit-serverless/charts/gateway/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.14.0 +version: 0.14.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.14.0" +appVersion: "0.14.1" diff --git a/charts/qiskit-serverless/charts/gateway/values.yaml b/charts/qiskit-serverless/charts/gateway/values.yaml index e8531ab0c..30f3ce20d 100644 --- a/charts/qiskit-serverless/charts/gateway/values.yaml +++ b/charts/qiskit-serverless/charts/gateway/values.yaml @@ -17,9 +17,9 @@ application: superuser: enable: true ray: - nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.0-py39" - nodeImage_py39: "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.0-py39" - nodeImage_py310: "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.0-py310" + nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.1-py39" + nodeImage_py39: "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.1-py39" + nodeImage_py310: "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.1-py310" cpu: 2 memory: 2 replicas: 1 diff --git a/charts/qiskit-serverless/values.yaml b/charts/qiskit-serverless/values.yaml index f6bf20f04..66b0b1a6a 100644 --- a/charts/qiskit-serverless/values.yaml +++ b/charts/qiskit-serverless/values.yaml @@ -2,7 +2,7 @@ # Qiskit Serverless Info # =================== global: - version: 0.14.0 + version: 0.14.1 # =================== # Qiskit Serverless configs @@ -47,7 +47,7 @@ gateway: image: repository: "icr.io/quantum-public/qiskit-serverless/gateway" pullPolicy: IfNotPresent - tag: "0.14.0" + tag: "0.14.1" application: siteHost: "http://gateway:8000" rayHost: "http://kuberay-head-svc:8265" @@ -59,7 +59,7 @@ gateway: type: ClusterIP port: 8000 ray: - nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.0-py310" + nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.1-py310" opensslImage: registry.access.redhat.com/ubi8/openssl:8.8-9 kubectlImage: alpine/k8s:1.29.2@sha256:a51aa37f0a34ff827c7f2f9cb7f6fbb8f0e290fa625341be14c2fcc4b1880f60 limits: diff --git a/client/qiskit_serverless/VERSION.txt b/client/qiskit_serverless/VERSION.txt index 0548fb4e9..c39e9c5fb 100644 --- a/client/qiskit_serverless/VERSION.txt +++ b/client/qiskit_serverless/VERSION.txt @@ -1 +1 @@ -0.14.0 \ No newline at end of file +0.14.1 \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 054f628d5..d22cf5dbd 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,7 +2,7 @@ services: ray-head: container_name: ray-head - image: icr.io/quantum-public/qiskit-serverless/ray-node:${VERSION:-0.14.0}-py310 + image: icr.io/quantum-public/qiskit-serverless/ray-node:${VERSION:-0.14.1}-py310 entrypoint: [ "ray", "start", "--head", "--port=6379", "--dashboard-host=0.0.0.0", "--block" @@ -27,7 +27,7 @@ services: always gateway: container_name: gateway - image: icr.io/quantum-public/qiskit-serverless/gateway:${VERSION:-0.14.0} + image: icr.io/quantum-public/qiskit-serverless/gateway:${VERSION:-0.14.1} command: gunicorn main.wsgi:application --bind 0.0.0.0:8000 --workers=4 ports: - 8000:8000 @@ -52,7 +52,7 @@ services: - postgres scheduler: container_name: scheduler - image: icr.io/quantum-public/qiskit-serverless/gateway:${VERSION:-0.14.0} + image: icr.io/quantum-public/qiskit-serverless/gateway:${VERSION:-0.14.1} entrypoint: "./scripts/scheduler.sh" environment: - DEBUG=0 diff --git a/docs/deployment/cloud.rst b/docs/deployment/cloud.rst index 84b797a34..deeb69949 100644 --- a/docs/deployment/cloud.rst +++ b/docs/deployment/cloud.rst @@ -84,7 +84,7 @@ Once your cluster is ready, the installation is relatively straightforward with and run the next commands: .. code-block:: - :caption: run this commands with the release version like 0.14.0 in x.y.z (2 places) + :caption: run this commands with the release version like 0.14.1 in x.y.z (2 places) $ helm -n install qiskit-serverless --create-namespace https://github.com/Qiskit/qiskit-serverless/releases/download/vx.y.z/qiskit-serverless-x.y.z.tgz @@ -119,6 +119,6 @@ with the configuration of your domain and provider. Optionally, you can install an observability package to handle logging and monitoring on your cluster by running the following command: .. code-block:: - :caption: run this commands with the release version like 0.14.0 in x.y.z (2 places) using the same namespace as in the previous helm command + :caption: run this commands with the release version like 0.14.1 in x.y.z (2 places) using the same namespace as in the previous helm command $ helm -n install qs-observability https://github.com/Qiskit/qiskit-serverless/releases/download/vx.y.z/qs-observability-x.y.z.tgz diff --git a/docs/deployment/custom_function/Sample-Dockerfile b/docs/deployment/custom_function/Sample-Dockerfile index e8423d7cd..bd36a70a4 100644 --- a/docs/deployment/custom_function/Sample-Dockerfile +++ b/docs/deployment/custom_function/Sample-Dockerfile @@ -1,4 +1,4 @@ -FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.0-py310 +FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.1-py310 # install all necessary dependencies for your custom image diff --git a/docs/deployment/deploying_custom_image_function.rst b/docs/deployment/deploying_custom_image_function.rst index 7a7c3f662..d51890416 100644 --- a/docs/deployment/deploying_custom_image_function.rst +++ b/docs/deployment/deploying_custom_image_function.rst @@ -50,7 +50,7 @@ In our simple case it will look something like this: .. code-block:: :caption: Dockerfile for custom image function. - FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.0-py310 + FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.1-py310 # install all necessary dependencies for your custom image diff --git a/docs/deployment/example_custom_image_function.rst b/docs/deployment/example_custom_image_function.rst index 4bfe2c75f..c19891979 100644 --- a/docs/deployment/example_custom_image_function.rst +++ b/docs/deployment/example_custom_image_function.rst @@ -49,7 +49,7 @@ Dockerfile .. code-block:: :caption: Dockerfile - FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.0-py310 + FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.1-py310 # install all necessary dependencies for your custom image diff --git a/gateway/Dockerfile b/gateway/Dockerfile index 286da43c8..cffb86850 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -1,5 +1,5 @@ FROM registry.access.redhat.com/ubi9-minimal:9.4-1134 -RUN microdnf install -y python3.11-3.11.7-1.el9_4.1 python3.11-pip-22.3.1-5.el9 python3.11-devel-3.11.7-1.el9_4.1 vim-enhanced-2:8.2.2637-20.el9_1 &&\ +RUN microdnf install -y python3.11-3.11.7 python3.11-pip-22.3.1 python3.11-devel-3.11.7 vim-enhanced-8.2.2637 &&\ microdnf clean all RUN ln -s /usr/bin/python3.11 /usr/local/bin/python3 && \ ln -s /usr/bin/python3.11 /usr/local/bin/python &&\ diff --git a/gateway/api/ray.py b/gateway/api/ray.py index 257802cb1..99a0b2973 100644 --- a/gateway/api/ray.py +++ b/gateway/api/ray.py @@ -201,7 +201,7 @@ def submit_job(job: Job) -> Job: return job -def create_ray_cluster( +def create_ray_cluster( # pylint: disable=too-many-branches job: Job, cluster_name: Optional[str] = None, cluster_data: Optional[str] = None, @@ -289,6 +289,8 @@ def create_ray_cluster( resource.title = cluster_name resource.host = host resource.save() + else: + raise RuntimeError("Something went wrong during cluster creation") return resource diff --git a/gateway/main/settings.py b/gateway/main/settings.py index 78550df01..af089a301 100644 --- a/gateway/main/settings.py +++ b/gateway/main/settings.py @@ -315,7 +315,7 @@ ), } RAY_NODE_IMAGE = os.environ.get( - "RAY_NODE_IMAGE", "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.0-py310" + "RAY_NODE_IMAGE", "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.1-py310" ) RAY_NODE_IMAGES_MAP = { "default": RAY_NODE_IMAGE,