Skip to content

Commit

Permalink
Merge branch 'main' into launcher_overhaul
Browse files Browse the repository at this point in the history
  • Loading branch information
garronej committed Oct 16, 2024
2 parents 31b51ba + 1640355 commit d88a74b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion helm-chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ 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.
version: 9.1.2
version: 9.2.0
10 changes: 5 additions & 5 deletions helm-chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ingress:
- host: datalab.my-domain.net
EOF

helm install onyxia onyxia/onyxia --version "9.1.2" -f onyxia-values.yaml
helm install onyxia onyxia/onyxia --version "9.2.0" -f onyxia-values.yaml
```

### Using the Keycloak Theme (Optional)
Expand All @@ -44,7 +44,7 @@ extraInitContainers: |
args:
- -c
- |
curl -L -f -S -o /extensions/onyxia.jar https://github.com/InseeFrLab/onyxia/releases/download/v9.1.2/keycloak-theme.jar
curl -L -f -S -o /extensions/onyxia.jar https://github.com/InseeFrLab/onyxia/releases/download/v9.2.0/keycloak-theme.jar
volumeMounts:
- name: extensions
mountPath: /extensions
Expand All @@ -70,8 +70,8 @@ After that, you should be able to select *onyxia* as *Login Theme*.

Documentation reference for the available configuration parameter of the Onyxia Helm Chart.

- [The REST API (`api`)](https://github.com/InseeFrLab/onyxia-api/blob/v3.0.0/README.md#configuration)
- [The Web Application (`web`)](https://github.com/InseeFrLab/onyxia/blob/web-v4.33.2/web/.env)
- [The REST API (`api`)](https://github.com/InseeFrLab/onyxia-api/blob/v3.1.0/README.md#configuration)
- [The Web Application (`web`)](https://github.com/InseeFrLab/onyxia/blob/web-v4.33.3/web/.env)

Below is a sample `onyxia-values.yaml` file that illustrates where to specify the `api` and `web` configuration parameters.

Expand Down Expand Up @@ -107,4 +107,4 @@ Below is a sample `onyxia-values.yaml` file that illustrates where to specify th
If you are building your own service catalog for Onyxia ([learn how](https://docs.onyxia.sh/catalog-of-services)).
Here are defined the onyxia reserved parameter and the structure of the dynamic context:

[`values.schema.json` `"x-onyxia"` specifications](https://github.com/InseeFrLab/onyxia/blob/web-v4.33.2/web/src/core/ports/OnyxiaApi/XOnyxia.ts)
[`values.schema.json` `"x-onyxia"` specifications](https://github.com/InseeFrLab/onyxia/blob/web-v4.33.3/web/src/core/ports/OnyxiaApi/XOnyxia.ts)
4 changes: 2 additions & 2 deletions helm-chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ web:
replicaCount: 1
image:
repository: inseefrlab/onyxia-web
tag: 4.33.2
tag: 4.33.3
pullPolicy: IfNotPresent

## Pod priority settings
Expand Down Expand Up @@ -102,7 +102,7 @@ api:
replicaCount: 1
image:
repository: inseefrlab/onyxia-api
tag: v3.0.0
tag: v3.1.0
pullPolicy: IfNotPresent
contextPath: /api

Expand Down
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "onyxia-web",
"homepage": "https://onyxia.sh",
"type": "module",
"version": "4.33.2",
"version": "4.33.3",
"license": "MIT",
"scripts": {
"prepare": "yarn install-git-hooks && vite-envs update-types && copy-material-icons-to-public",
Expand Down

0 comments on commit d88a74b

Please sign in to comment.