From 96656d6e6816dfb6dc4e6c23bafb4ce167fd6041 Mon Sep 17 00:00:00 2001 From: Michel Beloshitsky Date: Thu, 28 Mar 2024 14:56:43 +0300 Subject: [PATCH 1/7] keyserver --- charts/mapgl-js-api/templates/deployment.yaml | 2 -- charts/mapgl-js-api/values.yaml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/charts/mapgl-js-api/templates/deployment.yaml b/charts/mapgl-js-api/templates/deployment.yaml index 2e309769b..929e3bf3b 100644 --- a/charts/mapgl-js-api/templates/deployment.yaml +++ b/charts/mapgl-js-api/templates/deployment.yaml @@ -57,8 +57,6 @@ spec: - 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 }}" diff --git a/charts/mapgl-js-api/values.yaml b/charts/mapgl-js-api/values.yaml index ccfa42373..3840f6cc8 100644 --- a/charts/mapgl-js-api/values.yaml +++ b/charts/mapgl-js-api/values.yaml @@ -61,7 +61,7 @@ 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== From 9fafbdd941fe9a75aacd9e548ac5423985d290be Mon Sep 17 00:00:00 2001 From: Michel Beloshitsky Date: Wed, 10 Apr 2024 11:40:03 +0300 Subject: [PATCH 2/7] MAPGL_INVALID_KEY_MESSAGE env variable to configure invalid key message --- charts/mapgl-js-api/templates/deployment.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/mapgl-js-api/templates/deployment.yaml b/charts/mapgl-js-api/templates/deployment.yaml index 929e3bf3b..568438947 100644 --- a/charts/mapgl-js-api/templates/deployment.yaml +++ b/charts/mapgl-js-api/templates/deployment.yaml @@ -62,6 +62,8 @@ spec: 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 From 8b5708ca2dca59a8b73df942eafb5a9678f789e8 Mon Sep 17 00:00:00 2001 From: Michel Beloshitsky Date: Wed, 10 Apr 2024 11:41:58 +0300 Subject: [PATCH 3/7] f --- charts/mapgl-js-api/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/mapgl-js-api/values.yaml b/charts/mapgl-js-api/values.yaml index 3840f6cc8..f9477504f 100644 --- a/charts/mapgl-js-api/values.yaml +++ b/charts/mapgl-js-api/values.yaml @@ -52,6 +52,7 @@ image: # @param env.MAPGL_KEYSERVER Domain name 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. +# @skip env.MAPGL_INVALID_KEY_MESSAGE env: MAPGL_DEMO_KEY: empty @@ -64,7 +65,7 @@ env: 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 From b1f0e3380685ad6b5015c1d6868f09fdeb77f750 Mon Sep 17 00:00:00 2001 From: Michel Beloshitsky Date: Wed, 10 Apr 2024 11:42:27 +0300 Subject: [PATCH 4/7] f --- charts/mapgl-js-api/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/mapgl-js-api/values.yaml b/charts/mapgl-js-api/values.yaml index f9477504f..822ad9b35 100644 --- a/charts/mapgl-js-api/values.yaml +++ b/charts/mapgl-js-api/values.yaml @@ -52,7 +52,7 @@ image: # @param env.MAPGL_KEYSERVER Domain name 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. -# @skip env.MAPGL_INVALID_KEY_MESSAGE +# @param env.MAPGL_INVALID_KEY_MESSAGE Custom error message for invalid MapGL key. env: MAPGL_DEMO_KEY: empty From 0ecff6938734ef62b63b492718d5c12076ad9cba Mon Sep 17 00:00:00 2001 From: Michel Beloshitsky Date: Fri, 12 Apr 2024 17:43:57 +0300 Subject: [PATCH 5/7] review fixes --- charts/floors-api/values.yaml | 2 -- charts/mapgl-js-api/templates/deployment.yaml | 2 +- charts/mapgl-js-api/values.yaml | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/charts/floors-api/values.yaml b/charts/floors-api/values.yaml index 3b0e5d5b4..c990cb575 100644 --- a/charts/floors-api/values.yaml +++ b/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 diff --git a/charts/mapgl-js-api/templates/deployment.yaml b/charts/mapgl-js-api/templates/deployment.yaml index 568438947..b7ea17bca 100644 --- a/charts/mapgl-js-api/templates/deployment.yaml +++ b/charts/mapgl-js-api/templates/deployment.yaml @@ -53,7 +53,7 @@ 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 diff --git a/charts/mapgl-js-api/values.yaml b/charts/mapgl-js-api/values.yaml index 822ad9b35..017bcbf9e 100644 --- a/charts/mapgl-js-api/values.yaml +++ b/charts/mapgl-js-api/values.yaml @@ -43,13 +43,13 @@ image: # @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. From b078254c2f9476b2fdb61f6e2402069a50c9e809 Mon Sep 17 00:00:00 2001 From: Michel Beloshitsky Date: Fri, 26 Apr 2024 09:15:58 +0300 Subject: [PATCH 6/7] up versions --- charts/floors-api/Chart.yaml | 2 +- charts/mapgl-js-api/Chart.yaml | 2 +- charts/mapgl-js-api/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/floors-api/Chart.yaml b/charts/floors-api/Chart.yaml index 60ed32c36..0d785bb7a 100644 --- a/charts/floors-api/Chart.yaml +++ b/charts/floors-api/Chart.yaml @@ -4,7 +4,7 @@ description: Helm for floors service type: application version: 1.20.2 -appVersion: 1.0.4 +appVersion: 1.0.5 maintainers: - name: 2gis diff --git a/charts/mapgl-js-api/Chart.yaml b/charts/mapgl-js-api/Chart.yaml index a042b2406..50dd41db5 100644 --- a/charts/mapgl-js-api/Chart.yaml +++ b/charts/mapgl-js-api/Chart.yaml @@ -5,7 +5,7 @@ description: Basic WebGL map chart template for 2GIS On-Premise type: application version: 1.20.2 -appVersion: 1.45.1 +appVersion: 1.47.0 maintainers: - name: 2gis diff --git a/charts/mapgl-js-api/values.yaml b/charts/mapgl-js-api/values.yaml index 017bcbf9e..ecb01b9d7 100644 --- a/charts/mapgl-js-api/values.yaml +++ b/charts/mapgl-js-api/values.yaml @@ -36,7 +36,7 @@ podLabels: {} image: repository: 2gis-on-premise/mapgl - tag: 1.45.1 + tag: 1.47.0 pullPolicy: IfNotPresent From 95e8dc26051d2db3b7ced920a0abe5188b8ee3c9 Mon Sep 17 00:00:00 2001 From: itanka9 Date: Mon, 3 Jun 2024 15:21:43 +0300 Subject: [PATCH 7/7] up mapgl version && update READMEs --- charts/floors-api/README.md | 1 - charts/mapgl-js-api/README.md | 25 +++++++++++++------------ charts/mapgl-js-api/values.yaml | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/charts/floors-api/README.md b/charts/floors-api/README.md index 72f46b609..13ba02603 100644 --- a/charts/floors-api/README.md +++ b/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` | diff --git a/charts/mapgl-js-api/README.md b/charts/mapgl-js-api/README.md index 91c0edb3e..86728fe61 100644 --- a/charts/mapgl-js-api/README.md +++ b/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 diff --git a/charts/mapgl-js-api/values.yaml b/charts/mapgl-js-api/values.yaml index ecb01b9d7..add05e63d 100644 --- a/charts/mapgl-js-api/values.yaml +++ b/charts/mapgl-js-api/values.yaml @@ -36,7 +36,7 @@ podLabels: {} image: repository: 2gis-on-premise/mapgl - tag: 1.47.0 + tag: 1.47.1 pullPolicy: IfNotPresent