Skip to content

Commit

Permalink
update-version-0.15.0 (#1446)
Browse files Browse the repository at this point in the history
* [create-pull-request] automated change

* Updated some refs from last ray image changes

* Update .github/workflows/update-component-versions.yaml

Co-authored-by: Paul Schweigert <[email protected]>

* Remove version from test

* Update helm publish gha

---------

Co-authored-by: Tansito <[email protected]>
Co-authored-by: Paul Schweigert <[email protected]>
  • Loading branch information
3 people authored Aug 7, 2024
1 parent 6235f97 commit e3ece48
Show file tree
Hide file tree
Showing 19 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-helm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types: [published]

permissions:
contents: read
contents: write

jobs:
package:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-component-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
shell: bash
run: |
sed -i "s/${OLDNUM}/${NEWNUM}/g" docs/deployment/cloud.rst
sed -i "s/${OLDNUM}-py310/${NEWNUM}-py310/g" docs/deployment/deploying_custom_image_function.rst
sed -i "s/${OLDNUM}-py310/${NEWNUM}/g" docs/deployment/deploying_custom_image_function.rst
- name: Create PR
id: cpr
uses: peter-evans/create-pull-request@cd5c7e4b8bff84befe9c12e7cffbecfda02c7ce9 #6.1.0
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ git rebase main issue-1234-new-feature
### Adding tests

Our team upholds the philosophy that a healthy codebase will include the proper amount of testing.
From the project you are working on, you can run tests with `tox -epy310`.
From the project you are working on, you can run tests with `tox -epy311`.
Note if you run this command from qiskit-serverless top directory, it will build the project documentation.
For detailed testing guidelines using tox environments, please refer to [this documentation](./client/tests/README.md).

Expand Down
6 changes: 3 additions & 3 deletions charts/qiskit-serverless/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies:
- name: gateway
repository: ""
version: 0.14.2
version: 0.15.0
- name: nginx-ingress-controller
repository: https://charts.bitnami.com/bitnami
version: 9.11.0
Expand All @@ -11,5 +11,5 @@ dependencies:
- name: kuberay-operator
repository: https://ray-project.github.io/kuberay-helm
version: 1.1.1
digest: sha256:31e0c7ee15c26725bd1b559f24fa30fbdab506de77afc0311c6657ddf890ed2c
generated: "2024-08-01T16:29:27.215746-04:00"
digest: sha256:ae36b6484ca8d81355ba63f079abad6f1c9e0677be890d63e3c47ca3ccbe73b8
generated: "2024-08-06T22:24:25.007524029Z"
6 changes: 3 additions & 3 deletions charts/qiskit-serverless/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ description: Qiskit-Serverless helm chart that contains different dependencies.

type: application

version: 0.14.2
appVersion: "0.14.2"
version: 0.15.0
appVersion: "0.15.0"

dependencies:
- name: gateway
condition: gatewayEnable
version: 0.14.2
version: 0.15.0
- name: nginx-ingress-controller
condition: nginxIngressControllerEnable
version: 9.11.0
Expand Down
4 changes: 2 additions & 2 deletions charts/qiskit-serverless/charts/gateway/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
version: 0.15.0

# 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.2"
appVersion: "0.15.0"
4 changes: 2 additions & 2 deletions charts/qiskit-serverless/charts/gateway/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ application:
superuser:
enable: true
ray:
nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2"
nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.15.0"
cpu: 2
memory: 2
replicas: 1
minReplicas: 1
maxReplicas: 4
opensslImage: registry.access.redhat.com/ubi8/openssl:8.8-9
kubectlImage: alpine/k8s:1.29.2@sha256:a51aa37f0a34ff827c7f2f9cb7f6fbb8f0e290fa625341be14c2fcc4b1880f60
proxyImage: "icr.io/quantum-public/qiskit-serverless/proxy:0.14.2"
proxyImage: "icr.io/quantum-public/qiskit-serverless/proxy:0.15.0"
scrapeWithPrometheus: true
openTelemetry: false
openTelemetryCollector:
Expand Down
6 changes: 3 additions & 3 deletions charts/qiskit-serverless/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Qiskit Serverless Info
# ===================
global:
version: 0.14.2
version: 0.15.0

# ===================
# Qiskit Serverless configs
Expand Down Expand Up @@ -47,7 +47,7 @@ gateway:
image:
repository: "icr.io/quantum-public/qiskit-serverless/gateway"
pullPolicy: IfNotPresent
tag: "0.14.2"
tag: "0.15.0"
application:
siteHost: "http://gateway:8000"
rayHost: "http://kuberay-head-svc:8265"
Expand All @@ -59,7 +59,7 @@ gateway:
type: ClusterIP
port: 8000
ray:
nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2"
nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.15.0"
opensslImage: registry.access.redhat.com/ubi8/openssl:8.8-9
kubectlImage: alpine/k8s:1.29.2@sha256:a51aa37f0a34ff827c7f2f9cb7f6fbb8f0e290fa625341be14c2fcc4b1880f60
limits:
Expand Down
2 changes: 1 addition & 1 deletion client/qiskit_serverless/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.14.2
0.15.0
2 changes: 1 addition & 1 deletion client/tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The command `tox -eblack` will reformat all files in the repository according to
The `py##` environments are the main test environments. tox defines one for each version of Python. For instance, the following command will run the tests on Python 3.9 and Python 3.10:

```sh
$ tox -epy39,py310
$ tox -epy311
```

First, these environments execute all tests using [pytest], which supports its own simple style of tests, in addition to [unittest]-style tests and [doctests] located throughout the project's docstrings.
Expand Down
2 changes: 1 addition & 1 deletion client/tests/resources/test-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
testrayhead:
container_name: testrayhead
image: icr.io/quantum-public/qiskit-serverless/ray-node:latest-py310
image: icr.io/quantum-public/qiskit-serverless/ray-node:latest
entrypoint: [
"ray", "start", "--head", "--port=6379",
"--dashboard-host=0.0.0.0", "--block"
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
ray-head:
user: "0"
container_name: ray-head
image: icr.io/quantum-public/qiskit-serverless/ray-node:${VERSION:-0.14.2}-py310
image: icr.io/quantum-public/qiskit-serverless/ray-node:${VERSION:-0.15.0}
entrypoint: [
"ray", "start", "--head", "--port=6379",
"--dashboard-host=0.0.0.0", "--block"
Expand All @@ -28,7 +28,7 @@ services:
always
gateway:
container_name: gateway
image: icr.io/quantum-public/qiskit-serverless/gateway:${VERSION:-0.14.2}
image: icr.io/quantum-public/qiskit-serverless/gateway:${VERSION:-0.15.0}
command: gunicorn main.wsgi:application --bind 0.0.0.0:8000 --workers=4
ports:
- 8000:8000
Expand All @@ -53,7 +53,7 @@ services:
- postgres
scheduler:
container_name: scheduler
image: icr.io/quantum-public/qiskit-serverless/gateway:${VERSION:-0.14.2}
image: icr.io/quantum-public/qiskit-serverless/gateway:${VERSION:-0.15.0}
entrypoint: "./scripts/scheduler.sh"
environment:
- DEBUG=0
Expand Down
4 changes: 2 additions & 2 deletions docs/deployment/cloud.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.2 in x.y.z (2 places)
:caption: run this commands with the release version like 0.15.0 in x.y.z (2 places)
$ helm -n <INSERT_YOUR_NAMESPACE> install qiskit-serverless --create-namespace https://github.com/Qiskit/qiskit-serverless/releases/download/vx.y.z/qiskit-serverless-x.y.z.tgz
Expand Down Expand Up @@ -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.2 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.15.0 in x.y.z (2 places) using the same namespace as in the previous helm command
$ helm -n <INSERT_YOUR_NAMESPACE> install qs-observability https://github.com/Qiskit/qiskit-serverless/releases/download/vx.y.z/qs-observability-x.y.z.tgz
2 changes: 1 addition & 1 deletion docs/deployment/custom_function/Sample-Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2-py310@sha256:e012a6f7159b2660dd87af15bf85029fe62bec22e6bef7d99e54ca0cfa4f3aa6
FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.15.0

# install all necessary dependencies for your custom image

Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/deploying_custom_image_function.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-py310
FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.15.0
# install all necessary dependencies for your custom image
Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/example_custom_image_function.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Dockerfile
.. code-block::
:caption: Dockerfile
FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2-py310
FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.15.0
# install all necessary dependencies for your custom image
Expand Down
2 changes: 1 addition & 1 deletion gateway/main/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
),
}
RAY_NODE_IMAGE = os.environ.get(
"RAY_NODE_IMAGE", "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2"
"RAY_NODE_IMAGE", "icr.io/quantum-public/qiskit-serverless/ray-node:0.15.0"
)
RAY_CLUSTER_WORKER_REPLICAS = int(os.environ.get("RAY_CLUSTER_WORKER_REPLICAS", "1"))
RAY_CLUSTER_WORKER_REPLICAS_MAX = int(
Expand Down
2 changes: 1 addition & 1 deletion proxy/tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion = 2.1
envlist = py39, py310, lint, coverage
envlist = py311, lint, coverage
# CI: skip-next-line
skipsdist = true
# CI: skip-next-line
Expand Down
2 changes: 1 addition & 1 deletion tests/basic/function/Sample-Docker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2-py310
FROM icr.io/quantum-public/qiskit-serverless/ray-node:latest

# install all necessary dependencies for your custom image

Expand Down

0 comments on commit e3ece48

Please sign in to comment.