Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PRO-3689] Update helm-charts for pro-ui. #332

Merged
merged 2 commits into from
Oct 24, 2023
Merged

[PRO-3689] Update helm-charts for pro-ui. #332

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f5c74c
[PRO-3689] Update helm-charts for pro-ui.
m7v Oct 18, 2023
0881efa
Merge branch 'master' into PRO-3689-Support_mapgl_changes
Ashigo Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/pro-ui/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ type: application
description: A Helm chart for Kubernetes to deploy 2GIS Pro UI service

version: 1.11.0
appVersion: 1.1.0
appVersion: 1.2.0

maintainers:
- name: 2gis
Expand Down
20 changes: 11 additions & 9 deletions charts/pro-ui/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Use this Helm chart to deploy 2GIS Pro UI service, which is a part of 2GIS's [On
| Name | Description | Value |
| --------------------- | ------------------------------ | ------------------------ |
| `ui.image.repository` | Repository | `2gis-on-premise/pro-ui` |
| `ui.image.tag` | Tag | `1.1.0` |
| `ui.image.tag` | Tag | `1.2.0` |
| `imagePullPolicy` | Pull Policy | `IfNotPresent` |
| `imagePullSecrets` | Kubernetes image pull secrets. | `[]` |

Expand Down Expand Up @@ -65,14 +65,16 @@ Use this Helm chart to deploy 2GIS Pro UI service, which is a part of 2GIS's [On

### MapGL JS API settings

| Name | Description | Value |
| ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- | ---------------- |
| `ui.mapgl.host` | FQDN (domain or IP) for the [MapGL JS API](https://docs.2gis.com/en/on-premise/map) service without protocol. | `mapgl-api.host` |
| `ui.mapgl.key` | A key to the [MapGL JS API](https://docs.2gis.com/en/on-premise/map) service. | `""` |
| `ui.mapgl.styleUrl` | Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) `style.json` folder, e.g., '//mapgl.ingress.host/style' | `""` |
| `ui.mapgl.styleIconsUrl` | Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) icons folder, e.g., '//mapgl.ingress.host/style/icons' | `""` |
| `ui.mapgl.styleFontsUrl` | Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) fonts folder, e.g., '//mapgl.ingress.host/style/fonts' | `""` |
| `ui.mapgl.styleModelsUrl` | Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) models folder, e.g., '//mapgl.ingress.host/style/models' | `""` |
| Name | Description | Value |
| ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------- |
| `ui.mapgl.host` | FQDN (domain or IP) for the [MapGL JS API](https://docs.2gis.com/en/on-premise/map) service with or without protocol. Without protocol we will put App's protocol. | `mapgl-api.host` |
| `ui.mapgl.scriptPath` | URL path to [MapGL JS API](https://docs.2gis.com/en/on-premise/map) init script relative to `ui.mapgl.host`. | `""` |
| `ui.mapgl.key` | A key to the [MapGL JS API](https://docs.2gis.com/en/on-premise/map) service. | `""` |
| `ui.mapgl.styleId` | Optional the map style ID, that you can get at https://styles.2gis.com. | `""` |
| `ui.mapgl.styleUrl` | Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) `style.json` folder, e.g., '//mapgl.ingress.host/style'. ui.mapgl.styleUrl has priority over ui.mapgl.styleId. | `""` |
| `ui.mapgl.styleIconsUrl` | Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) icons folder, e.g., '//mapgl.ingress.host/style/icons' | `""` |
| `ui.mapgl.styleFontsUrl` | Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) fonts folder, e.g., '//mapgl.ingress.host/style/fonts' | `""` |
| `ui.mapgl.styleModelsUrl` | Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) models folder, e.g., '//mapgl.ingress.host/style/models' | `""` |

### Strategy settings

Expand Down
4 changes: 4 additions & 0 deletions charts/pro-ui/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
value: "{{ required "A valid .Values.ui.api.url entry required" .Values.ui.api.url }}"
- name: MAPGL_HOST
value: "{{ required "A valid .Values.ui.mapgl.host entry required" .Values.ui.mapgl.host }}"
- name: MAPGL_SCRIPT_PATH
value: "{{ .Values.ui.mapgl.scriptPath }}"
- name: MAPGL_STYLE_ID
value: "{{ .Values.ui.mapgl.styleId }}"
- name: MAPGL_KEY
value: "{{ required "A valid .Values.ui.mapgl.key entry required" .Values.ui.mapgl.key }}"
- name: MAPGL_STYLE_URL
Expand Down
6 changes: 6 additions & 0 deletions charts/pro-ui/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,15 @@
"key": {
"type": "string"
},
"styleId": {
"type": "string"
},
"styleUrl": {
"type": "string"
},
"scriptPath": {
"type": "string"
},
"styleIconsUrl": {
"type": "string"
},
Expand Down
10 changes: 7 additions & 3 deletions charts/pro-ui/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ui:

image:
repository: 2gis-on-premise/pro-ui
tag: 1.1.0
tag: 1.2.0

# @section UI service settings

Expand Down Expand Up @@ -92,16 +92,20 @@ ui:

# @section MapGL JS API settings

# @param ui.mapgl.host FQDN (domain or IP) for the [MapGL JS API](https://docs.2gis.com/en/on-premise/map) service without protocol.
# @param ui.mapgl.host FQDN (domain or IP) for the [MapGL JS API](https://docs.2gis.com/en/on-premise/map) service with or without protocol. Without protocol we will put App's protocol.
# @param ui.mapgl.scriptPath URL path to [MapGL JS API](https://docs.2gis.com/en/on-premise/map) init script relative to `ui.mapgl.host`.
# @param ui.mapgl.key A key to the [MapGL JS API](https://docs.2gis.com/en/on-premise/map) service.
# @param ui.mapgl.styleUrl Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) `style.json` folder, e.g., '//mapgl.ingress.host/style'
# @param ui.mapgl.styleId Optional the map style ID, that you can get at https://styles.2gis.com.
# @param ui.mapgl.styleUrl Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) `style.json` folder, e.g., '//mapgl.ingress.host/style'. ui.mapgl.styleUrl has priority over ui.mapgl.styleId.
# @param ui.mapgl.styleIconsUrl Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) icons folder, e.g., '//mapgl.ingress.host/style/icons'
# @param ui.mapgl.styleFontsUrl Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) fonts folder, e.g., '//mapgl.ingress.host/style/fonts'
# @param ui.mapgl.styleModelsUrl Optional URL for [MapGL Style](https://docs.2gis.com/en/mapgl/styles/overview/editor) models folder, e.g., '//mapgl.ingress.host/style/models'

mapgl:
host: mapgl-api.host
scriptPath: ''
key: ''
styleId: ''
styleUrl: ''
styleIconsUrl: ''
styleFontsUrl: ''
Expand Down