From 8d6a63e71dbe16b6a3a0f063ebb73a1fd3d5a7c9 Mon Sep 17 00:00:00 2001 From: Donov Dmitriy Date: Tue, 7 Nov 2023 18:16:52 +0700 Subject: [PATCH 1/3] Configure catalog importer schema extensions --- charts/catalog-api/README.md | 17 +++++++++-------- charts/catalog-api/templates/helpers.tpl | 2 ++ charts/catalog-api/values.yaml | 2 ++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/charts/catalog-api/README.md b/charts/catalog-api/README.md index 42634a725..ee3d642b8 100644 --- a/charts/catalog-api/README.md +++ b/charts/catalog-api/README.md @@ -191,14 +191,15 @@ See the [documentation](https://docs.2gis.com/en/on-premise/search) to learn abo ### importer.postgres **Database settings** -| Name | Description | Value | -| --------------------------------------- | ------------------------------------------------ | ------ | -| `importer.postgres.host` | PostgreSQL rw hostname or IP. **Required** | `""` | -| `importer.postgres.port` | PostgreSQL port | `5432` | -| `importer.postgres.name` | PostgreSQL database name. **Required** | `""` | -| `importer.postgres.username` | PostgreSQL username with rw access. **Required** | `""` | -| `importer.postgres.password` | PostgreSQL password. **Required** | `""` | -| `importer.postgres.schemaSwitchEnabled` | Automatic switch PostgreSQL schema on releases | `true` | +| Name | Description | Value | +| --------------------------------------- | ------------------------------------------------ | ------------ | +| `importer.postgres.host` | PostgreSQL rw hostname or IP. **Required** | `""` | +| `importer.postgres.port` | PostgreSQL port | `5432` | +| `importer.postgres.name` | PostgreSQL database name. **Required** | `""` | +| `importer.postgres.username` | PostgreSQL username with rw access. **Required** | `""` | +| `importer.postgres.password` | PostgreSQL password. **Required** | `""` | +| `importer.postgres.schemaSwitchEnabled` | Automatic switch PostgreSQL schema on releases | `true` | +| `importer.postgres.schemaExtensions` | Schema for PostgreSQL extensions | `extensions` | ### importer.persistentVolume **Persistent Volume settings** diff --git a/charts/catalog-api/templates/helpers.tpl b/charts/catalog-api/templates/helpers.tpl index da5cca347..4fa2a6a8c 100644 --- a/charts/catalog-api/templates/helpers.tpl +++ b/charts/catalog-api/templates/helpers.tpl @@ -155,6 +155,8 @@ onprem value: "{{ include "catalog.manifestCode" . }}" - name: IMPORTER_DB_CATALOG_SCHEMA_SWITCH_ENABLED value: "{{ .Values.importer.postgres.schemaSwitchEnabled }}" +- name: IMPORTER_DB_CATALOG_SCHEMA_EXTENSIONS + value: "{{ .Values.importer.postgres.schemaExtensions }}" - name: IMPORTER_DB_CATALOG_HOST value: "{{ required "A valid .Values.importer.postgres.host entry required" .Values.importer.postgres.host }}" - name: IMPORTER_DB_CATALOG_PORT diff --git a/charts/catalog-api/values.yaml b/charts/catalog-api/values.yaml index cdfa2bd5e..8f37da169 100644 --- a/charts/catalog-api/values.yaml +++ b/charts/catalog-api/values.yaml @@ -273,6 +273,7 @@ importer: # @param importer.postgres.username PostgreSQL username with rw access. **Required** # @param importer.postgres.password PostgreSQL password. **Required** # @param importer.postgres.schemaSwitchEnabled Automatic switch PostgreSQL schema on releases + # @param importer.postgres.schemaExtensions Schema for PostgreSQL extensions postgres: host: '' @@ -281,6 +282,7 @@ importer: username: '' password: '' schemaSwitchEnabled: true + schemaExtensions: 'extensions' # @section importer.persistentVolume **Persistent Volume settings** From 331d02a8116a6c1c40ee3554e3c1b9b9f488b1e3 Mon Sep 17 00:00:00 2001 From: Donov Dmitriy Date: Fri, 10 Nov 2023 12:11:20 +0700 Subject: [PATCH 2/3] Configure catalog importer schema extensions --- charts/catalog-api/templates/helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/catalog-api/templates/helpers.tpl b/charts/catalog-api/templates/helpers.tpl index 4fa2a6a8c..4e4db126e 100644 --- a/charts/catalog-api/templates/helpers.tpl +++ b/charts/catalog-api/templates/helpers.tpl @@ -45,7 +45,7 @@ onprem {{- define "catalog.env.postgres" -}} - name: CATALOG_DB_SCHEMA - value: "{{ include "catalog.manifestCode" . }},extensions" + value: "{{ include "catalog.manifestCode" . }},{{ .Values.importer.postgres.schemaExtensions }}" - name: CATALOG_DB_QUERY_TIMEOUT value: "{{ .Values.api.postgres.queryTimeout }}" - name: CATALOG_DB_BRANCH_POOL_SIZE From ae86daecdecb71092438cc196861daa1eb1673e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B5=D0=BD=D0=B8=D1=81=20=D0=91=D0=B5=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=B2?= Date: Thu, 7 Dec 2023 16:53:36 +0700 Subject: [PATCH 3/3] upd breaking-changes --- Breaking-Changes.md | 6 ++++++ charts/catalog-api/values.yaml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Breaking-Changes.md b/Breaking-Changes.md index e8bc3a50b..7adecbad5 100644 --- a/Breaking-Changes.md +++ b/Breaking-Changes.md @@ -1,5 +1,11 @@ # 2GIS On-Premise Breaking-Changes +## [1.16.0] + +### catalog-api + +- Changes in data for catalog, if you have a version lower than 1.16.0, you need to update to version 1.16.0 to get the latest data + ## [1.13.0] ### tiles-api diff --git a/charts/catalog-api/values.yaml b/charts/catalog-api/values.yaml index 8f37da169..13212e607 100644 --- a/charts/catalog-api/values.yaml +++ b/charts/catalog-api/values.yaml @@ -262,7 +262,7 @@ importer: image: repository: 2gis-on-premise/catalog-importer - tag: 1.0.10 + tag: 1.1.0 pullPolicy: IfNotPresent # @section importer.postgres **Database settings**