-
Couldn't load subscription status.
- Fork 10
BASIS-556: configure origin and host for access check and bss stats #780
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.
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
Open
IgorYurevich
wants to merge
11
commits into
develop
Choose a base branch
from
BASIS-556-configure-origin-and-host-for-access-check-and-bss-stats
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+64
−34
Open
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
b0b9f59
BASIS-556: добавил параметры для пропуска проверки ключа и отправки b…
1673b4e
BASIS-556: добавил возможность менять конфигурацию паттерна для отпра…
986e879
BASIS-556: добавил флаги для использования стандартных значаний для r…
9715101
BASIS-556: убрал лишние параметры и добавил понятное описание
a3073be
BASIS-556: убрал лишние параметры и добавил понятное описание
1b2360c
BASIS-556: rebase с develop
4694242
fix: values context
r9odt 460f20a
BASIS-556: поднял версию тега и поправил ридми
9c4d899
Merge branch 'BASIS-556-configure-origin-and-host-for-access-check-an…
3968f92
BASIS-556: поправил тег для importer
6a7998e
fix: format for regexp, use only one backslash
r9odt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -125,31 +125,37 @@ See the [documentation](https://docs.2gis.com/en/on-premise/map) to learn about: | |
|
|
||
| ### API Keys proxy settings | ||
|
|
||
| | Name | Description | Value | | ||
| | --------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------- | | ||
| | `proxy` | **Common settings** | | | ||
| | `proxy.logLevelOverride` | A custom proxy logging level. Allowed options: info|warn|debug|error. If not defined, default logLevel will be used. | `""` | | ||
| | `proxy.logFormatOverride` | A custom proxy logging format. Allowed options: text|json. If not defined, default logFormat will be used. | `""` | | ||
| | `proxy.containerPort` | Port the proxy listens on. | `5000` | | ||
| | `proxy.timeout` | Proxy timeout, in seconds. | `5s` | | ||
| | `proxy.resources` | **Kubernetes [resource management settings](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)** | | | ||
| | `proxy.resources.requests.cpu` | A CPU request. | `50m` | | ||
| | `proxy.resources.requests.memory` | A memory request. | `128Mi` | | ||
| | `proxy.resources.limits.cpu` | A CPU limit. | `1` | | ||
| | `proxy.resources.limits.memory` | A memory limit. | `512Mi` | | ||
| | `proxy.image` | **Docker image settings** | | | ||
| | `proxy.image.repository` | Docker Repository. | `2gis-on-premise/tiles-api-proxy` | | ||
| | `proxy.image.tag` | Docker image tag. | `4.75.9` | | ||
| | `proxy.image.pullPolicy` | Kubernetes pull policy for the service's Docker image. | `IfNotPresent` | | ||
| | `proxy.access` | **API Keys service access settings** | | | ||
| | `proxy.access.enabled` | If access to the [API Keys service](https://docs.2gis.com/en/on-premise/keys) is enabled. | `false` | | ||
| | `proxy.access.url` | API Keys endpoint url, ex: http://keys-api.svc. **Required** | `""` | | ||
| | `proxy.access.syncPeriod` | Proxy sync period. | `2m` | | ||
| | `proxy.access.raster.token` | Service key for raster data in Keys API. Used for key validation. If Keys API is unavailable or token is empty/invalid, tile service will continue to work without key validation (with warning in logs). | `""` | | ||
| | `proxy.access.vector.token` | Service key for vector data in Keys API. Used for key validation. If Keys API is unavailable or token is empty/invalid, tile service will continue to work without key validation (with warning in logs). | `""` | | ||
| | `proxy.access.stat` | **Statistics receiver settings** | | | ||
| | `proxy.access.stat.enabled` | If statistics receiver is enabled. | `false` | | ||
| | `proxy.access.stat.url` | Statistics receiver endpoint url, ex: http(s)://host:port/path. **Required** | `""` | | ||
| | Name | Description | Value | | ||
| | ---------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------- | | ||
| | `proxy` | **Common settings** | | | ||
| | `proxy.logLevelOverride` | A custom proxy logging level. Allowed options: info|warn|debug|error. If not defined, default logLevel will be used. | `""` | | ||
| | `proxy.logFormatOverride` | A custom proxy logging format. Allowed options: text|json. If not defined, default logFormat will be used. | `""` | | ||
| | `proxy.containerPort` | Port the proxy listens on. | `5000` | | ||
| | `proxy.timeout` | Proxy timeout, in seconds. | `5s` | | ||
| | `proxy.resources` | **Kubernetes [resource management settings](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)** | | | ||
| | `proxy.resources.requests.cpu` | A CPU request. | `50m` | | ||
| | `proxy.resources.requests.memory` | A memory request. | `128Mi` | | ||
| | `proxy.resources.limits.cpu` | A CPU limit. | `1` | | ||
| | `proxy.resources.limits.memory` | A memory limit. | `512Mi` | | ||
| | `proxy.image` | **Docker image settings** | | | ||
| | `proxy.image.repository` | Docker Repository. | `2gis-on-premise/tiles-api-proxy` | | ||
| | `proxy.image.tag` | Docker image tag. | `4.75.9` | | ||
| | `proxy.image.pullPolicy` | Kubernetes pull policy for the service's Docker image. | `IfNotPresent` | | ||
| | `proxy.access` | **API Keys service access settings** | | | ||
| | `proxy.access.enabled` | If access to the [API Keys service](https://docs.2gis.com/en/on-premise/keys) is enabled. | `false` | | ||
| | `proxy.access.url` | API Keys endpoint url, ex: http://keys-api.svc. **Required** | `""` | | ||
| | `proxy.access.syncPeriod` | Proxy sync period. | `2m` | | ||
| | `proxy.access.raster.token` | Service key for raster data in Keys API. Used for key validation. If Keys API is unavailable or token is empty/invalid, tile service will continue to work without key validation (with warning in logs). | `""` | | ||
| | `proxy.access.vector.token` | Service key for vector data in Keys API. Used for key validation. If Keys API is unavailable or token is empty/invalid, tile service will continue to work without key validation (with warning in logs). | `""` | | ||
| | `proxy.access.skipExactOrigins` | **Skip requests with exact origins feature settings** | | | ||
| | `proxy.access.skipExactOrigins.enabled` | If enabled, only requests with exact origins will skip access key check, otherwise all requests will be checked. | `false` | | ||
| | `proxy.access.skipExactOrigins.regexpPattern` | Regular expression for matching origins that will skip access key check. **Required** | `""` | | ||
| | `proxy.access.stat` | **Statistics receiver settings** | | | ||
| | `proxy.access.stat.enabled` | If statistics receiver is enabled. | `false` | | ||
| | `proxy.access.stat.url` | Statistics receiver endpoint url, ex: http(s)://host:port/path. **Required** | `""` | | ||
| | `proxy.access.stat.registerExactHosts` | **Register requests to BSS for exact hosts feature settings** | | | ||
| | `proxy.access.stat.registerExactHosts.enabled` | If disabled, all requests will be registered in BSS, otherwise the only requests to exact hosts that matches regexp will be registered (hosts of tiles-api). | `false` | | ||
| | `proxy.access.stat.registerExactHosts.regexpPattern` | Regular expression for matching hosts that will be registered to statistics. **Required** | `""` | | ||
|
|
||
| ### Tiles API settings | ||
|
|
||
|
|
@@ -290,6 +296,6 @@ See the [documentation](https://docs.2gis.com/en/on-premise/map) to learn about: | |
|
|
||
| ## Maintainers | ||
|
|
||
| | Name | Email | Url | | ||
| | ---- | ------ | --- | | ||
| | Name | Email | Url | | ||
| | ---- | --------------------- | ------------------------- | | ||
| | 2gis | <[email protected]> | <https://github.com/2gis> | | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Поправил, спасибо