diff --git a/charts/statbank-pxwebapi/README.md b/charts/statbank-pxwebapi/README.md index b21aecc..987b448 100644 --- a/charts/statbank-pxwebapi/README.md +++ b/charts/statbank-pxwebapi/README.md @@ -49,7 +49,7 @@ Document datasets in Statistics Norway. | persistence.enabled | bool | `false` | | | persistence.size | string | `"10Gi"` | | | podAnnotations | object | `{}` | | -| podLabels."onyxia.app" | string | `"datadoc"` | | +| podLabels."onyxia.app" | string | `"statbank-pxwebapi"` | | | podSecurityContext.fsGroup | int | `100` | | | replicaCount | int | `1` | | | resources | object | `{}` | | diff --git a/charts/statbank-pxwebapi/templates/NOTES.txt b/charts/statbank-pxwebapi/templates/NOTES.txt index 1846a17..fc2227b 100644 --- a/charts/statbank-pxwebapi/templates/NOTES.txt +++ b/charts/statbank-pxwebapi/templates/NOTES.txt @@ -1,5 +1,5 @@ {{- if .Values.istio.enabled }} -- You can connect to datadoc with your browser on this [link](https://{{ .Values.istio.hostname }}) +- You can connect to PxWebApi with your browser on this [link](https://{{ .Values.istio.hostname }}) {{- if .Values.networking.user.enabled }} - You can connect to your custom port on this [link](https://{{ .Values.istio.userHostname }}) If you don't run your custom service you will get a 502 bad gateway error. diff --git a/charts/statbank-pxwebapi/templates/statefulset.yaml b/charts/statbank-pxwebapi/templates/statefulset.yaml index 85d91d6..c3b48b9 100644 --- a/charts/statbank-pxwebapi/templates/statefulset.yaml +++ b/charts/statbank-pxwebapi/templates/statefulset.yaml @@ -47,7 +47,7 @@ spec: securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} subdomain: {{ include "library-chart.fullname" . }} - hostname: datadoc + hostname: statbank-pxwebapi containers: - name: {{ .Chart.Name }} securityContext: @@ -62,7 +62,7 @@ spec: fieldPath: metadata.name - name: IMAGE_NAME value: "{{ .Values.service.image.version }}" - - name: DATADOC_DATASET_PATH + - name: PXWEBAPI_DATASET_PATH value: {{ .Values.dataset.dataset_path }} - name: PROJECT_USER value: {{ .Values.environment.user }} diff --git a/charts/statbank-pxwebapi/values.schema.json b/charts/statbank-pxwebapi/values.schema.json index 63ea7e9..267af8b 100644 --- a/charts/statbank-pxwebapi/values.schema.json +++ b/charts/statbank-pxwebapi/values.schema.json @@ -29,17 +29,13 @@ "x-onyxia": { "hidden": true }, - "enum": [ - "IfNotPresent", - "Always", - "Never" - ] + "enum": ["IfNotPresent", "Always", "Never"] }, "version": { "description": "supported versions", "type": "string", "render": "list", - "default": "europe-north1-docker.pkg.dev/artifact-registry-5n/dapla-lab-docker/onyxia/datadoc:master" + "default": "europe-north1-docker.pkg.dev/artifact-registry-5n/dapla-lab-docker/onyxia/statbank-pxwebapi:main" } } } @@ -274,9 +270,7 @@ "title": "OAuth2 provider", "description": "Which OAuth2 provider to use, keycloak-oidc is the only one available for now", "default": "keycloak-oidc", - "enum": [ - "keycloak-oidc" - ], + "enum": ["keycloak-oidc"], "x-onyxia": { "hidden": true, "overwriteDefaultWith": "region.oauth2.provider" @@ -356,28 +350,28 @@ "form": true, "title": "Networking detail", "properties": { - "user": { - "type": "object", - "description": "user defined port", - "properties": { - "enabled": { - "type": "boolean", - "title": "Enable a custom service port", - "description": "Enable a custom service port", - "default": false - }, - "port": { - "type": "integer", - "description": "port of the custom service", - "title": "Custom service port", - "hidden": { - "value": false, - "path": "networking/user/enabled" - }, - "default": 8050 - } - } + "user": { + "type": "object", + "description": "user defined port", + "properties": { + "enabled": { + "type": "boolean", + "title": "Enable a custom service port", + "description": "Enable a custom service port", + "default": false + }, + "port": { + "type": "integer", + "description": "port of the custom service", + "title": "Custom service port", + "hidden": { + "value": false, + "path": "networking/user/enabled" + }, + "default": 8050 + } } + } } }, "userAttributes": { diff --git a/charts/statbank-pxwebapi/values.yaml b/charts/statbank-pxwebapi/values.yaml index e21d594..a9da0a4 100644 --- a/charts/statbank-pxwebapi/values.yaml +++ b/charts/statbank-pxwebapi/values.yaml @@ -66,7 +66,7 @@ kubernetes: podAnnotations: {} podLabels: - onyxia.app: "datadoc" + onyxia.app: "statbank-pxwebapi" podSecurityContext: fsGroup: 100