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

Configure catalog importer schema extensions #342

Merged
merged 4 commits into from
Dec 7, 2023
Merged

Configure catalog importer schema extensions #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d6a63e
Configure catalog importer schema extensions
Nov 7, 2023
331d02a
Configure catalog importer schema extensions
Nov 10, 2023
ae86dae
upd breaking-changes
dbelyaev-nsk Dec 7, 2023
9f2eadd
Merge branch 'develop' into catalog-importer-schema-extensions
dbelyaev-nsk Dec 7, 2023
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
6 changes: 6 additions & 0 deletions Breaking-Changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.15.0]

### navi-router
Expand Down
17 changes: 9 additions & 8 deletions charts/catalog-api/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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**

Expand Down
4 changes: 3 additions & 1 deletion charts/catalog-api/templates/helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion charts/catalog-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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**
Expand All @@ -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: ''
Expand All @@ -281,6 +282,7 @@ importer:
username: ''
password: ''
schemaSwitchEnabled: true
schemaExtensions: 'extensions'

# @section importer.persistentVolume **Persistent Volume settings**

Expand Down