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

2gis · Oct 24, 2023 · 3f3da32 · 3f3da32
1 parent 75799da
commit 3f3da32
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 14 deletions.
diff --git a/charts/pro-ui/Chart.yaml b/charts/pro-ui/Chart.yaml
@@ -3,8 +3,9 @@ name: pro-ui
 type: application
 description: A Helm chart for Kubernetes to deploy 2GIS Pro UI service
 
-version: 1.12.0
-appVersion: 1.1.0
+version: 1.11.0
+appVersion: 1.2.0
+
 
 maintainers:
 - name: 2gis

diff --git a/charts/pro-ui/README.md b/charts/pro-ui/README.md
@@ -32,7 +32,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. | `[]`                     |
 
@@ -64,14 +64,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
 

diff --git a/charts/pro-ui/templates/_helpers.tpl b/charts/pro-ui/templates/_helpers.tpl
@@ -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

diff --git a/charts/pro-ui/values.schema.json b/charts/pro-ui/values.schema.json
@@ -116,9 +116,15 @@
             "key": {
               "type": "string"
             },
+            "styleId": {
+              "type": "string"
+            },
             "styleUrl": {
               "type": "string"
             },
+            "scriptPath": {
+              "type": "string"
+            },
             "styleIconsUrl": {
               "type": "string"
             },

diff --git a/charts/pro-ui/values.yaml b/charts/pro-ui/values.yaml
@@ -37,7 +37,7 @@ ui:
 
   image:
     repository: 2gis-on-premise/pro-ui
-    tag: 1.1.0
+    tag: 1.2.0
 
   # @section UI service settings
 
@@ -90,16 +90,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: ''