Release-1.16.0 (#367)

* release-1.16.0 (#366)
2gis · Dec 12, 2023 · bd7308a · bd7308a
1 parent 69e22e4
commit bd7308a
Show file tree

Hide file tree

Showing 59 changed files with 396 additions and 189 deletions.
diff --git 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.15.0]
 
 ### navi-router

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # 2GIS On-Premise Changelog
 
+## [1.16.0] (2023-12-12)
+#### [Breaking-Changes](Breaking-Changes.md#1600)
+#### Images
+```
+catalog-api
+	- catalog-importer:1.0.10
+	+ catalog-importer:1.1.0
+citylens
+	- citylens-api:1.1.2
+	+ citylens-api:1.2.6
+	- citylens-database:1.1.2
+	+ citylens-database:1.2.0
+	- citylens-web:1.1.2
+	+ citylens-web:1.2.6
+keys
+	- keys-backend:1.69.0
+	+ keys-backend:1.71.0
+mapgl-js-api
+	- mapgl:1.40.0
+	+ mapgl:1.42.0
+pro-api
+	+ pro-importer:1.1.67
+pro-ui
+	- pro-ui:1.3.0
+	+ pro-ui:1.4.0
+search-api
+	- search-api:7.65.0
+	+ search-api:7.68.0
+
+```
+
 ## [1.15.0] (2023-11-30)
 #### [Breaking-Changes](Breaking-Changes.md#1500)
 #### Images

diff --git a/charts/catalog-api/Chart.yaml b/charts/catalog-api/Chart.yaml
@@ -3,7 +3,7 @@ name: catalog-api
 type: application
 description: A Helm chart for Kubernetes to deploy Catalog APIs
 
-version: 1.15.0
+version: 1.16.0
 appVersion: 3.600.0
 
 maintainers:

diff --git a/charts/catalog-api/README.md b/charts/catalog-api/README.md
@@ -186,19 +186,20 @@ See the [documentation](https://docs.2gis.com/en/on-premise/search) to learn abo
 | Name                        | Description                                                                                   | Value                              |
 | --------------------------- | --------------------------------------------------------------------------------------------- | ---------------------------------- |
 | `importer.image.repository` | Repository                                                                                    | `2gis-on-premise/catalog-importer` |
-| `importer.image.tag`        | Tag                                                                                           | `1.0.10`                           |
+| `importer.image.tag`        | Tag                                                                                           | `1.1.0`                            |
 | `importer.image.pullPolicy` | Image [Pull Policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) | `IfNotPresent`                     |
 
 ### 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
@@ -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
@@ -76,16 +76,6 @@ onprem
       name: {{ include "catalog.secret.deploys.name" . }}
       key: apiDbPassword
 
-- name: CATALOG_DB_API_KEY_URL
-  value: "jdbc:postgresql://{{ .Values.api.postgres.host }}:{{ .Values.api.postgres.port }}/{{ .Values.api.postgres.name }}"
-- name: CATALOG_DB_API_KEY_LOGIN
-  value: "{{ .Values.api.postgres.username }}"
-- name: CATALOG_DB_API_KEY_PASS
-  valueFrom:
-    secretKeyRef:
-      name: {{ include "catalog.secret.deploys.name" . }}
-      key: apiDbPassword
-
 - name: CATALOG_DB_RUBRIC_URL
   value: "jdbc:postgresql://{{ .Values.api.postgres.host }}:{{ .Values.api.postgres.port }}/{{ .Values.api.postgres.name }}"
 - name: CATALOG_DB_RUBRIC_LOGIN
@@ -155,6 +145,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
@@ -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**
@@ -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**
 

diff --git a/charts/citylens/Chart.yaml b/charts/citylens/Chart.yaml
@@ -3,8 +3,8 @@ name: citylens
 type: application
 description: A Helm chart for Kubernetes to deploy Citylens service
 
-version: 1.15.0
-appVersion: 1.1.2
+version: 1.16.0
+appVersion: 1.2.6
 
 maintainers:
 - name: 2gis