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

Jump to bottom

WAPI-23606 catalog search config #475

Merged
merged 2 commits into from
Aug 29, 2024
Merged

WAPI-23606 catalog search config #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41309ca
Update changelog (#473)
DAMoskalev Jul 25, 2024
b9b0454
WAPI-23606 настройки кол-ва коннектов с search-api в catalog-api
Jul 29, 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 Breaking-Changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 2GIS On-Premise Breaking-Changes

## [#.#.#]
## [1.26.0]

### citylens
- Added new worker `worker.dashboardBatchEvents`
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# 2GIS On-Premise Changelog

## [1.26.0] (2024-07-25)
#### [Breaking-Changes](Breaking-Changes.md#1260)
#### Images
```
catalog-api
Expand Down
11 changes: 7 additions & 4 deletions charts/catalog-api/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,13 @@ See the [documentation](https://docs.2gis.com/en/on-premise/search) to learn abo

### Search settings

| Name | Description | Value |
| ----------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
| `search.url` | URL of the Search service, ex: http://{search-api}.svc. This URL should be accessible from all the pods within your Kubernetes cluster. **Required** | `""` |
| `search.connectTimeout` | Timeout for connect to the Search service | `300ms` |
| Name | Description | Value |
| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
| `search.url` | URL of the Search service, ex: http://{search-api}.svc. This URL should be accessible from all the pods within your Kubernetes cluster. **Required** | `""` |
| `search.connectTimeout` | Timeout for connect to the Search service | `300ms` |
| `search.minConnections` | The minimum number connections to the Search service | `10` |
| `search.maxConnections` | The maximum number connections to the Search service | `100` |
| `search.maxOpenRequests` | The maximum number open requests to the Search service | `128` |

### Keys settings

Expand Down
6 changes: 6 additions & 0 deletions charts/catalog-api/templates/helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@ onprem
value: "{{ required "A valid .Values.search.url entry required" .Values.search.url }}"
- name: CATALOG_SAPPHIRE_CONNECTION_TIMEOUT
value: "{{ .Values.search.connectTimeout }}"
- name: CATALOG_SAPPHIRE_MIN_CONNECTIONS
value: "{{ .Values.search.minConnections }}"
- name: CATALOG_SAPPHIRE_MAX_CONNECTIONS
value: "{{ .Values.search.maxConnections }}"
- name: CATALOG_SAPPHIRE_MAX_OPEN_REQUESTS
value: "{{ .Values.search.maxOpenRequests }}"
{{- end }}

{{- define "catalog.env.keys" -}}
Expand Down
6 changes: 6 additions & 0 deletions charts/catalog-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,16 @@ api:

# @param search.url URL of the Search service, ex: http://{search-api}.svc. This URL should be accessible from all the pods within your Kubernetes cluster. **Required**
# @param search.connectTimeout Timeout for connect to the Search service
# @param search.minConnections The minimum number connections to the Search service
# @param search.maxConnections The maximum number connections to the Search service
# @param search.maxOpenRequests The maximum number open requests to the Search service

search:
url: ''
connectTimeout: 300ms
minConnections: 10
maxConnections: 100
maxOpenRequests: 128

# @section Keys settings

Expand Down
Loading