Правки в чартах mapgl-js-api и floors-api (#420)

charts/floors-api/Chart.yaml

@@ -4,7 +4,7 @@ description: Helm for floors service
 type: application
 
 version: 1.23.0
-appVersion: 1.0.4
+appVersion: 1.0.5
 
 maintainers:
 - name: 2gis

charts/floors-api/README.md

@@ -100,7 +100,6 @@ Read more about the On-Premise solution [here](https://docs.2gis.com/en/on-premi
 
 | Name                               | Description                      | Value                             |
 | ---------------------------------- | -------------------------------- | --------------------------------- |
-| `import.enabled`                   | If import task should be enabled | `true`                            |
 | `import.image.repository`          | Import task image repository.    | `2gis-on-premise/floors-importer` |
 | `import.image.tag`                 | Import task image tag.           | `1.0.4`                           |
 | `import.image.pullPolicy`          | Import task pull policy.         | `IfNotPresent`                    |

charts/floors-api/values.yaml

@@ -150,7 +150,6 @@ nginx:
 
 # @section Floors API data import settings
 
-# @param import.enabled If import task should be enabled
 # @param import.image.repository Import task image repository.
 # @param import.image.tag Import task image tag.
 # @param import.image.pullPolicy Import task pull policy.
@@ -161,7 +160,6 @@ nginx:
 # @extra import.resources.limits.memory A memory limit, e.g., `128Mi`.
 
 import:
-  enabled: true
   image:
     repository: 2gis-on-premise/floors-importer
     pullPolicy: IfNotPresent

charts/mapgl-js-api/Chart.yaml

@@ -5,7 +5,7 @@ description: Basic WebGL map chart template for 2GIS On-Premise
 type: application
 
 version: 1.23.0
-appVersion: 1.45.1
+appVersion: 1.47.1
 
 maintainers:
 - name: 2gis

charts/mapgl-js-api/README.md

@@ -45,22 +45,23 @@ See the [documentation](https://docs.2gis.com/en/on-premise/map) to learn about:
 | Name               | Description | Value                   |
 | ------------------ | ----------- | ----------------------- |
 | `image.repository` | Repository  | `2gis-on-premise/mapgl` |
-| `image.tag`        | Tag         | `1.45.1`                |
+| `image.tag`        | Tag         | `1.47.1`                |
 | `image.pullPolicy` | Pull Policy | `IfNotPresent`          |
 
 ### Environment variables
 
-| Name                          | Description                                                   | Value                                                                                             |
-| ----------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
-| `env.MAPGL_HOST`              | Domain name for MapGL JS API service.                         | `https://mapgl-api.ingress.host`                                                                  |
-| `env.MAPGL_TILES_API`         | Domain name of the Tiles API service.                         | `https://tiles-api.ingress.host`                                                                  |
-| `env.MAPGL_TILESET`           | Tileset of the Tiles API service to use.                      | `web`                                                                                             |
-| `env.MAPGL_IMMERSIVE_TILESET` | Additional immersive tileset of the Tiles API service to use. | `web_immersive`                                                                                   |
-| `env.MAPGL_TRAFFICSERVER`     | Domain name of the Traffic Proxy service.                     | `https://traffic-proxy.ingress.host`                                                              |
-| `env.MAPGL_FLOORSSERVER`      | Domain name of the Floors API service.                        | `https://floors-api.ingress.host`                                                                 |
-| `env.MAPGL_KEYSERVER`         | Domain name of the API Keys service.                          | `https://keys-api.ingress.host`                                                                   |
-| `env.MAPGL_RTLPLUGIN`         | URL of the plugin for right-to-left languages support.        | `https://mapgl-api.ingress.host/api/js/plugins/rtl-v1.0.0.js`                                     |
-| `env.MAPGL_RTLPLUGINHASH`     | SHA512 hash of the RTL plugin.                                | `sha512-YAPPEl+Atvsm/cMkrfWefmlQLAlKTGaqFjIkI6urAnDgam2uTVEVVnZZEhHCa91JjYYxa5yr4Ndb4Vl3NUovfA==` |
+| Name                            | Description                                                   | Value                                                                                             |
+| ------------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| `env.MAPGL_HOST`                | URL for MapGL JS API service.                                 | `https://mapgl-api.ingress.host`                                                                  |
+| `env.MAPGL_TILES_API`           | URL of the Tiles API service.                                 | `https://tiles-api.ingress.host`                                                                  |
+| `env.MAPGL_TILESET`             | Tileset of the Tiles API service to use.                      | `web`                                                                                             |
+| `env.MAPGL_IMMERSIVE_TILESET`   | Additional immersive tileset of the Tiles API service to use. | `web_immersive`                                                                                   |
+| `env.MAPGL_TRAFFICSERVER`       | Domain name of the Traffic Proxy service.                     | `https://traffic-proxy.ingress.host`                                                              |
+| `env.MAPGL_FLOORSSERVER`        | URL of the Floors API service.                                | `https://floors-api.ingress.host`                                                                 |
+| `env.MAPGL_KEYSERVER`           | URL of the API Keys service.                                  | `https://keys-api.ingress.host/public/v1/keys/{keyID}/services/mapgl-js-api`                      |
+| `env.MAPGL_RTLPLUGIN`           | URL of the plugin for right-to-left languages support.        | `https://mapgl-api.ingress.host/api/js/plugins/rtl-v1.0.0.js`                                     |
+| `env.MAPGL_RTLPLUGINHASH`       | SHA512 hash of the RTL plugin.                                | `sha512-YAPPEl+Atvsm/cMkrfWefmlQLAlKTGaqFjIkI6urAnDgam2uTVEVVnZZEhHCa91JjYYxa5yr4Ndb4Vl3NUovfA==` |
+| `env.MAPGL_INVALID_KEY_MESSAGE` | Custom error message for invalid MapGL key.                   | `Your MapGL key is invalid. Please contact support to get valid key.`                             |
 
 ### Strategy settings
 

charts/mapgl-js-api/templates/deployment.yaml

@@ -53,17 +53,17 @@ spec:
             - name: MAPGL_TRAFFICSERVER
               value: "{{ .Values.env.MAPGL_TRAFFICSERVER }}"
             - name: MAPGL_FLOORSSERVER
-              value: "https://{{ .Values.env.MAPGL_FLOORSSERVER }}"
+              value: "{{ .Values.env.MAPGL_FLOORSSERVER }}"
             - name: MAPGL_FLOORSSERVER_HOST
               value: "{{ .Values.env.MAPGL_FLOORSSERVER }}"
             - name: MAPGL_KEYSERVER
-              value: "https://{{ .Values.env.MAPGL_KEYSERVER }}/public/v1/keys/{keyID}/services/mapgl-js-api"
-            - name: MAPGL_KEYSERVER_HOST
               value: "{{ .Values.env.MAPGL_KEYSERVER }}"
             - name: MAPGL_RTLPLUGIN
               value: "{{ .Values.env.MAPGL_RTLPLUGIN }}"
             - name: MAPGL_RTLPLUGINHASH
               value: "{{ .Values.env.MAPGL_RTLPLUGINHASH }}"
+            - name: MAPGL_INVALID_KEY_MESSAGE
+              value: "{{ .Values.env.MAPGL_INVALID_KEY_MESSAGE }}"
           ports:
             - name: http
               containerPort: 8080

charts/mapgl-js-api/values.yaml

@@ -36,22 +36,23 @@ podLabels: {}
 
 image:
   repository: 2gis-on-premise/mapgl
-  tag: 1.45.1
+  tag: 1.47.1
   pullPolicy: IfNotPresent
 
 
 # @section Environment variables
 
 # @skip env.MAPGL_DEMO_KEY
-# @param env.MAPGL_HOST Domain name for MapGL JS API service.
-# @param env.MAPGL_TILES_API Domain name of the Tiles API service.
+# @param env.MAPGL_HOST URL for MapGL JS API service.
+# @param env.MAPGL_TILES_API URL of the Tiles API service.
 # @param env.MAPGL_TILESET Tileset of the Tiles API service to use.
 # @param env.MAPGL_IMMERSIVE_TILESET Additional immersive tileset of the Tiles API service to use.
 # @param env.MAPGL_TRAFFICSERVER Domain name of the Traffic Proxy service.
-# @param env.MAPGL_FLOORSSERVER Domain name of the Floors API service.
-# @param env.MAPGL_KEYSERVER Domain name of the API Keys service.
+# @param env.MAPGL_FLOORSSERVER URL of the Floors API service.
+# @param env.MAPGL_KEYSERVER URL of the API Keys service.
 # @param env.MAPGL_RTLPLUGIN URL of the plugin for right-to-left languages support.
 # @param env.MAPGL_RTLPLUGINHASH SHA512 hash of the RTL plugin.
+# @param env.MAPGL_INVALID_KEY_MESSAGE Custom error message for invalid MapGL key.
 
 env:
   MAPGL_DEMO_KEY: empty
@@ -61,10 +62,10 @@ env:
   MAPGL_IMMERSIVE_TILESET: web_immersive
   MAPGL_TRAFFICSERVER: https://traffic-proxy.ingress.host
   MAPGL_FLOORSSERVER: https://floors-api.ingress.host
-  MAPGL_KEYSERVER: https://keys-api.ingress.host
+  MAPGL_KEYSERVER: "https://keys-api.ingress.host/public/v1/keys/{keyID}/services/mapgl-js-api"
   MAPGL_RTLPLUGIN: https://mapgl-api.ingress.host/api/js/plugins/rtl-v1.0.0.js
   MAPGL_RTLPLUGINHASH: sha512-YAPPEl+Atvsm/cMkrfWefmlQLAlKTGaqFjIkI6urAnDgam2uTVEVVnZZEhHCa91JjYYxa5yr4Ndb4Vl3NUovfA==
-
+  MAPGL_INVALID_KEY_MESSAGE: Your MapGL key is invalid. Please contact support to get valid key.
 
 # @section Strategy settings