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

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

Merged
merged 9 commits into from
Jun 19, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
96656d6
keyserver
itanka9 Mar 28, 2024
9fafbdd
MAPGL_INVALID_KEY_MESSAGE env variable to configure invalid key message
itanka9 Apr 10, 2024
8b5708c
f
itanka9 Apr 10, 2024
b1f0e33
f
itanka9 Apr 10, 2024
0ecff69
review fixes
itanka9 Apr 12, 2024
b078254
up versions
itanka9 Apr 26, 2024
9a6becd
Merge branch 'develop' into fix-keyserver-for-mapgl
itanka9 Apr 26, 2024
8247d2b
Merge branch 'develop' into fix-keyserver-for-mapgl
itanka9 Jun 3, 2024
95e8dc2
up mapgl version && update READMEs
itanka9 Jun 3, 2024
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/floors-api/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion charts/floors-api/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
2 changes: 0 additions & 2 deletions charts/floors-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/mapgl-js-api/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 13 additions & 12 deletions charts/mapgl-js-api/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions charts/mapgl-js-api/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions charts/mapgl-js-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -61,10 +62,10 @@ env:
MAPGL_IMMERSIVE_TILESET: web_immersive
MAPGL_TRAFFICSERVER: https://traffic-proxy.ingress.host
MAPGL_FLOORSSERVER: https://floors-api.ingress.host
Copy link
Contributor

@v-a-v v-a-v Mar 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не совсем по ПР, но приведенный пример не работает. Только вот так, доменом

Suggested change
MAPGL_FLOORSSERVER: https://floors-api.ingress.host
MAPGL_FLOORSSERVER: floors-api.ingress.host

Можете поправить чтобы это было URL, а не домен, и речь не про пример, а про функционал? А функионал сейчас такой, что он дописывает https://, Хочется этим явно управлять. Этого же касается MAPGL_TRAFFICSERVER

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Т.е. поясню, если воспрользоваться примером, то тут допишится еще один https://

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Привет, эту штуку я поправил.

Только по MAPGL_TRAFFICSERVER кажется все работать должно, я уточню, может в движке где-то у нас проблема.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@v-a-v Проверил еще раз, пробки норм работают, если задавать их как MAPGL_TRAFFICSERVER: https://jam.api.2gis.com/

This comment was marked as resolved.

Sign in to view

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

Expand Down
Loading