From 41309cae38761462221cb132fdf74b9d207a4bed Mon Sep 17 00:00:00 2001 From: DAMoskalev <33502773+DAMoskalev@users.noreply.github.com> Date: Thu, 25 Jul 2024 13:08:34 +0300 Subject: [PATCH 1/2] Update changelog (#473) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix pro-api/values.yaml doc (#432) * [tiles-api] Upgrade to 4.54.0 (#428) * Add missing default for enabled_modules->predictors in citylens-web configmap (#433) * navi-router 6.17.0.8 -> 6.17.1.2 (#434) * [PRO-5009] Changed helm/hooks. (#436) * pro-ui: New external style manager config (#426) * pro-ui: New external style manager config * GH Actions readme checker workflow (#438) * base wf * fix * update * update * update * update * update * update * clean * clean * minor documentation changes --------- Co-authored-by: Dmitrii Moskalev * Gh actions readme checker changing name (#440) * base wf * fix * update * update * update * update * update * update * clean * clean * minor documentation changes * changing name --------- Co-authored-by: Dmitrii Moskalev * PRO-UI 2.14.0 (#441) * PRO-UI fix hooks (#443) * [PRO-5181] Обновление pro-api до версии 1.22.0 и pro-ui до версии 2.15.1 (#435) * [PRO-5181] Обновление pro-api до версии 1.17 * [PRO-5181] Поправлены замечания по ревью * [PRO-5181] Поправлен url для catalog * [PRO-5181] обновил образ до 1.22.0 * [PRO-5181] Обновление pro-api до версии 1.17 * [PRO-5181] Поправлены замечания по ревью * [PRO-5181] Поправлен url для catalog * [PRO-5181] обновил образ до 1.22.0 * Add new version for PRO-UI * Fix readme * Citylens 1.9.0 & custom CA support (#439) * Added custom CA support * Update version to 1.9.0 * Fix customCA documentation * Update readme * Fix broken templating * Fix citylens-web configmap (#448) * Gis-platform. Мелкие правки по дефолтным параметрам (#450) * [license] Fixed issue with k8s ca automount (#444) * WAPI-23444 custom ca twins api (#437) * WAPI-23444 custom ca twins api * WAPI-23444 custom ca twins api * WAPI-23444 custom ca twins api * Bump citylens to 1.10.0 (#453) * Bump citylens to 1.10.0 * Complete renaming pro.url to pro.baseUrl * PRO-5559: upgrade key ui to latest (#449) * PRO-5559: upgrade key ui to latest * WAPI-23482 Add configuration for Public API sign (#429) * WAPI-23482 Add configuration for Public API sign * impr * disabled by default * optional signkey in secret * optional signkey in secret * upd image version * reset chart version --------- Co-authored-by: Kirill Salnikov * Правки в чартах mapgl-js-api и floors-api (#420) * Add ability to add extra env vars to citylens-web deployment (#455) * Add ability to add extra env vars to citylens-web deployment * Fix missing end tag * chart/generic-chart syncup (#452) * pro-api serviceAccountOverride support (#456) * changes * update * value description added * readme update * readme update --------- Co-authored-by: Dmitrii Moskalev * [chart/navi-back] 7.23.0.5 release (#451) * fix conflict * [ONPREM-839] Add revisionHistoryLimit (#459) * add revisionHistoryLimit spec for catalog-api * add revisionHistoryLimit for citylens * add revisionHistoryLimit for dgtt * add revisionHistoryLimit for floors-api * add revisionHistoryLimit to gis-platform * add revisionHistoryLimit to keycloak * add revisionHistoryLimit to kays * add revisionHistoryLimit to license * add revisionHistoryLimit to mapgl * add revisionHistoryLimit to platform * add revisionHistoryLimit to search-api * add revisionHistoryLimit to stat-reciever * add revisionHistoryLimit to traffic-proxy * Add revisionHistoryLimit to twins-api * update readme files * fix schema and value path * fix license lint error * remove revisionHistoryLimit for StatefulSet * add revision history limit to navi-services (#458) * add revisionHistoryLimit to navi-async-matrix * add revisionHistoryLimit to navi-castle * add revisionHistoryLimit to navi-front * add revisionHistoryLimit to navi-restrictions * add revisionHistoryLimit to navi-router * update readme files for navi * update default value to 3 * remove revisionHistoryLimit for StatefulSet * Add github action with Mattermost Notify (#465) * [DEVOPS-1178] add navi back freeroam (#447) * [tiles-api] Upgrade to 4.54.0 (#428) * PRO-UI 2.14.0 (#441) * [DEVOPS-1178] add navi back freeroam * [DEVOPS-1178] up versions and add rules for free roam * [DEVOPS-1178] typo * [DEVOPS-1178] add gzip --------- Co-authored-by: FreakyGranny Co-authored-by: Aveldin1 <164148461+Aveldin1@users.noreply.github.com> Co-authored-by: Сентябов Александр Сергеевич * [PRO-5488] Change-Helm for PRO-UI (#460) * Change-Helm for PRO-UI * Fix Readme * add link to docs.2gis.com --------- Co-authored-by: Igor Sheykin * Add new citylens-workers based worker & add Drivers asset-related topics (#466) * Update Chart.yaml * changelog update * conflict trash fix * update --------- Co-authored-by: Igor Sheykin <49325415+Ashigo@users.noreply.github.com> Co-authored-by: FreakyGranny Co-authored-by: Петр Беклемишев Co-authored-by: i-bogomazov <106957509+i-bogomazov@users.noreply.github.com> Co-authored-by: Andrew Mikhailov Co-authored-by: Konstantin Lobov Co-authored-by: Dmitrii Moskalev Co-authored-by: Aveldin1 <164148461+Aveldin1@users.noreply.github.com> Co-authored-by: Денис Беляев Co-authored-by: Denis Belyaev <74010851+dbelyaev-nsk@users.noreply.github.com> Co-authored-by: v-loboda <111125664+v-loboda@users.noreply.github.com> Co-authored-by: Sergey Ordin <61708156+sergeLeLe@users.noreply.github.com> Co-authored-by: Voronkov Alexander Co-authored-by: Vladimir Popov Co-authored-by: Dmitriy Donov Co-authored-by: ostrovskiy2gis <108522609+ostrovskiy2gis@users.noreply.github.com> Co-authored-by: Kirill Salnikov Co-authored-by: Michel Beloshitsky Co-authored-by: Полозов Игорь Сергеевич Co-authored-by: uk-navi-ci <161344134+uk-navi-ci@users.noreply.github.com> Co-authored-by: Sergey Vlasov Co-authored-by: Alexandr Sentyabov <36183816+SanchezzRU@users.noreply.github.com> Co-authored-by: Сентябов Александр Сергеевич Co-authored-by: Igor Sheykin --- Breaking-Changes.md | 2 +- CHANGELOG.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 From b9b0454695624b9d5a435bd3fe418aa34c9fbc3c Mon Sep 17 00:00:00 2001 From: Donov Dmitriy Date: Mon, 29 Jul 2024 18:42:34 +0700 Subject: [PATCH 2/2] =?UTF-8?q?WAPI-23606=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BA=D0=BE=D0=BB-=D0=B2=D0=B0=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D0=BD=D0=B5=D0=BA=D1=82=D0=BE=D0=B2=20=D1=81?= =?UTF-8?q?=20search-api=20=D0=B2=20catalog-api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- charts/catalog-api/README.md | 11 +++++++---- charts/catalog-api/templates/helpers.tpl | 6 ++++++ charts/catalog-api/values.yaml | 6 ++++++ 3 files changed, 19 insertions(+), 4 deletions(-) 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