Skip to content

Commit

Permalink
Merge branch 'main' into ssb
Browse files Browse the repository at this point in the history
  • Loading branch information
johnksv committed Feb 22, 2024
2 parents 9d2b609 + 2c1189b commit d941e2f
Show file tree
Hide file tree
Showing 88 changed files with 2,583 additions and 9,772 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ssb_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
TAG: ${{ github.ref_name }}-${{ github.sha }}

jobs:
test:
test_web:
runs-on: ubuntu-latest
steps:
- uses: InseeFrLab/onyxia@gh-actions
Expand All @@ -27,8 +27,6 @@ jobs:
- uses: bahmutov/[email protected]
- run: yarn build
- run: npx keycloakify
env:
XDG_CACHE_HOME: "/home/runner/.cache/yarn"

test_helm-chart:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Onyxia is developed by the French National institute of statistics and economic

**Core feature set**:

- [An interface for launching docker images](https://datalab.sspcloud.fr/catalog/inseefrlab-helm-charts-datascience)
- [An interface for helm charts](https://datalab.sspcloud.fr/catalog/inseefrlab-helm-charts-datascience)
(e.g: [Jupyter](https://jupyter.org), [RStudio](https://www.rstudio.com)) on demand on a [Kubernetes](https://kubernetes.io) cluster.
The catalog of available images is not part of the app, you can create your own.
([here](https://github.com/inseefrlab/helm-charts-datascience) is the catalog we build for the institute's needs.)
Expand Down
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: 8.4.7
version: 8.4.8
8 changes: 4 additions & 4 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 "8.4.7" -f onyxia-values.yaml
helm install onyxia onyxia/onyxia --version "8.4.8" -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/v8.4.7/keycloak-theme.jar
curl -L -f -S -o /extensions/onyxia.jar https://github.com/InseeFrLab/onyxia/releases/download/v8.4.8/keycloak-theme.jar
volumeMounts:
- name: extensions
mountPath: /extensions
Expand All @@ -71,7 +71,7 @@ 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/v2.2.1/README.md#configuration)
- [The Web Application (`web`)](https://github.com/InseeFrLab/onyxia/blob/web-v4.15.6/web/.env)
- [The Web Application (`web`)](https://github.com/InseeFrLab/onyxia/blob/web-v4.15.9/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.15.6/web/src/core/ports/OnyxiaApi/XOnyxia.ts)
[`values.schema.json` `"x-onyxia"` specifications](https://github.com/InseeFrLab/onyxia/blob/web-v4.15.9/web/src/core/ports/OnyxiaApi/XOnyxia.ts)
2 changes: 1 addition & 1 deletion 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.15.6
tag: 4.15.9
pullPolicy: IfNotPresent

## Pod priority settings
Expand Down
Loading

0 comments on commit d941e2f

Please sign in to comment.