diff --git a/Breaking-Changes.md b/Breaking-Changes.md index 8faf673c..ea9465ac 100644 --- a/Breaking-Changes.md +++ b/Breaking-Changes.md @@ -1,6 +1,6 @@ # 2GIS On-Premise Breaking-Changes -## [#.#.#] +## [1.26.0] ### citylens - Added new worker `worker.dashboardBatchEvents` diff --git a/CHANGELOG.md b/CHANGELOG.md index 72164e7d..9f76d789 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 2GIS On-Premise Changelog ## [1.26.0] (2024-07-25) +#### [Breaking-Changes](Breaking-Changes.md#1260) #### Images ``` catalog-api diff --git a/charts/catalog-api/README.md b/charts/catalog-api/README.md index 5ddc8478..7c89aaa0 100644 --- a/charts/catalog-api/README.md +++ b/charts/catalog-api/README.md @@ -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 diff --git a/charts/catalog-api/templates/helpers.tpl b/charts/catalog-api/templates/helpers.tpl index e13ffc19..6e0fb6c4 100644 --- a/charts/catalog-api/templates/helpers.tpl +++ b/charts/catalog-api/templates/helpers.tpl @@ -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" -}} diff --git a/charts/catalog-api/values.yaml b/charts/catalog-api/values.yaml index b6784e38..5cd1ec62 100644 --- a/charts/catalog-api/values.yaml +++ b/charts/catalog-api/values.yaml @@ -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