2gis · mprudnikov3 · Oct 24, 2024 · Oct 24, 2024
@@ -4,7 +4,12 @@ name: Send notification to Mattermost
 
 on:
   pull_request:
-    types: [opened, reopened, edited, ready_for_review]
+    types:
+      - opened
+      - reopened
+      - edited
+      - ready_for_review
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -21,7 +26,7 @@ jobs:
       - uses: mattermost/action-mattermost-notify@master
         if: ${{ (github.event.pull_request.draft == false && startsWith(github.event.pull_request.title, 'WIP:') == false && github.event.action == 'edited'  &&  startsWith(github.event.changes.title.from, 'WIP:') == true ) ||  github.event.action == 'ready_for_review'}}
         with:
-          MATTERMOST_WEBHOOK_URL: ${{ secrets.MM_WEBHOOK_URL }}
+          MATTERMOST_WEBHOOK_URL: ${{ secrets.MM_WH_PR }}
           MATTERMOST_USERNAME: Github
           MATTERMOST_ICON_URL: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c2/GitHub_Invertocat_Logo.svg/256px-GitHub_Invertocat_Logo.svg.png
           TEXT: |

@@ -0,0 +1,27 @@
+---
+
+name: Send release notification to Mattermost
+
+on:
+  workflow_run:
+    workflows:
+      - "Release Charts"
+    push:
+      tags:
+        - \d+\.\d+\.\d+
+    types:
+      - completed
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mattermost/action-mattermost-notify@master
+        if: ${{ github.event.workflow_run.conclusion == 'success' }}
+        with:
+          MATTERMOST_WEBHOOK_URL: ${{ secrets.MM_WH_ON_PREMISE_RELEASE }}
+          MATTERMOST_USERNAME: Github
+          MATTERMOST_ICON_URL: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c2/GitHub_Invertocat_Logo.svg/256px-GitHub_Invertocat_Logo.svg.png
+          TEXT: |
+            Опубликован On-Premise: ${{ github.ref_name }} 
+            Документация: https://confluence.2gis.ru/display/Karta/Release+${{ github.ref_name }}+On-Premise
@@ -1,5 +1,13 @@
 # 2GIS On-Premise Breaking-Changes
 
+## [1.30.0]
+
+### pro-api
+- api.pod.appName renamed api.appName
+- api.settings.enableUserAssetsImporter renamed to api.settings.backgroundJobs.enableUserAssetsImporter
+- api.settings.enableAssetsStreaming renamed to api.settings.backgroundJobs.enableAssetsStreaming
+- api.settings.auth.permissionsApiKey renamed permissions.settings.auth.apiKey
+
 ## [1.29.0]
 
 ### mapgl-js-api

@@ -1,5 +1,43 @@
 # 2GIS On-Premise Changelog
 
+## [1.30.0] (2024-10-24)
+#### [Breaking-Changes](Breaking-Changes.md#1300)
+#### Images
+```
+citylens
+	- citylens-api:1.13.1
+	+ citylens-api:1.14.2
+	- citylens-database:1.13.0
+	+ citylens-database:1.14.0
+	- citylens-web:1.13.0
+	+ citylens-web:1.14.2
+	- citylens-workers:1.13.0
+	+ citylens-workers:1.14.2
+keys
+	- keys-backend:1.87.0
+	+ keys-backend:1.89.0
+pro-api
+	- pro-api:1.35.0
+	+ pro-api:1.41.0
+	- pro-importer:1.35.0
+	+ pro-importer:1.41.0
+	- pro-importer:1.35.0
+	+ pro-importer:1.41.0
+	- pro-permissions-api:1.35.0
+	+ pro-permissions-api:1.41.0
+pro-ui
+	- pro-importer:1.35.0
+	+ pro-importer:1.41.0
+tiles-api
+	- tiles-api-importer:4.54.0
+	+ tiles-api-importer:4.61.0
+	- tiles-api-proxy:4.54.0
+	+ tiles-api-proxy:4.61.0
+	- tiles-api:4.54.0
+	+ tiles-api:4.61.0
+
+```
+
 ## [1.29.0] (2024-10-02)
 #### [Breaking-Changes](Breaking-Changes.md#1290)
 #### Images

@@ -3,7 +3,7 @@ name: catalog-api
 type: application
 description: A Helm chart for Kubernetes to deploy Catalog APIs
 
-version: 1.29.0
+version: 1.30.0
 appVersion: 3.625.0
 
 maintainers:

@@ -3,8 +3,8 @@ name: citylens
 type: application
 description: A Helm chart for Kubernetes to deploy Citylens service
 
-version: 1.29.0
-appVersion: 1.13.1
+version: 1.30.0
+appVersion: 1.14.2
 
 maintainers:
 - name: 2gis

@@ -47,7 +47,7 @@ See the [documentation]() to learn about:
 | Name                   | Description  | Value                          |
 | ---------------------- | ------------ | ------------------------------ |
 | `api.image.repository` | Repository.  | `2gis-on-premise/citylens-api` |
-| `api.image.tag`        | Tag.         | `1.13.1`                       |
+| `api.image.tag`        | Tag.         | `1.14.2`                       |
 | `api.image.pullPolicy` | Pull Policy. | `IfNotPresent`                 |
 
 ### Resources settings
@@ -133,7 +133,7 @@ See the [documentation]() to learn about:
 | Name                   | Description  | Value                          |
 | ---------------------- | ------------ | ------------------------------ |
 | `web.image.repository` | Repository.  | `2gis-on-premise/citylens-web` |
-| `web.image.tag`        | Tag.         | `1.13.0`                       |
+| `web.image.tag`        | Tag.         | `1.14.2`                       |
 | `web.image.pullPolicy` | Pull Policy. | `IfNotPresent`                 |
 
 ### Resources settings
@@ -185,10 +185,11 @@ See the [documentation]() to learn about:
 
 ### Custom settings
 
-| Name                 | Description                                            | Value          |
-| -------------------- | ------------------------------------------------------ | -------------- |
-| `web.logLevel`       | Log level.                                             | `WARNING`      |
-| `web.metricsAppName` | Value for service prometheus metrics label "app_name". | `citylens-web` |
+| Name                 | Description                                                              | Value          |
+| -------------------- | ------------------------------------------------------------------------ | -------------- |
+| `web.logLevel`       | Log level.                                                               | `WARNING`      |
+| `web.metricsAppName` | Value for service prometheus metrics label "app_name".                   | `citylens-web` |
+| `web.pgPoolSize`     | Postgres: maximum number of connections in connections pool to maintain. | `5`            |
 
 ### Metadata settings
 
@@ -351,7 +352,7 @@ See the [documentation]() to learn about:
 | Name                                               | Description                                                                                                                                    | Value                              |
 | -------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- |
 | `worker.dashboardBatchEvents.image.repository`     | Repository.                                                                                                                                    | `2gis-on-premise/citylens-workers` |
-| `worker.dashboardBatchEvents.image.tag`            | Tag.                                                                                                                                           | `1.13.0`                           |
+| `worker.dashboardBatchEvents.image.tag`            | Tag.                                                                                                                                           | `1.14.2`                           |
 | `worker.dashboardBatchEvents.image.pullPolicy`     | Pull Policy.                                                                                                                                   | `IfNotPresent`                     |
 | `worker.dashboardBatchEvents.logLevel`             | Worker's log level.                                                                                                                            | `INFO`                             |
 | `worker.dashboardBatchEvents.revisionHistoryLimit` | Revision history limit (used for [rolling back](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) a deployment). | `3`                                |
@@ -369,7 +370,7 @@ See the [documentation]() to learn about:
 | -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------- |
 | `migrations.enabled`                   | If migrations needed.                                                                                                   | `true`                              |
 | `migrations.image.repository`          | Repository.                                                                                                             | `2gis-on-premise/citylens-database` |
-| `migrations.image.tag`                 | Tag.                                                                                                                    | `1.13.0`                            |
+| `migrations.image.tag`                 | Tag.                                                                                                                    | `1.14.0`                            |
 | `migrations.image.pullPolicy`          | Pull Policy                                                                                                             | `IfNotPresent`                      |
 | `migrations.resources.requests.cpu`    | A CPU request.                                                                                                          | `100m`                              |
 | `migrations.resources.requests.memory` | A memory request.                                                                                                       | `1Gi`                               |

@@ -29,6 +29,7 @@ data:
     metrics_app_name: {{ .Values.web.metricsAppName }}
     db_connections:
       postgres: {{ include "citylens.pgDSN"  . | squote }}
+      postgres_pool_size: {{ .Values.web.pgPoolSize }}
     kafka:
     {{- with .Values.kafka }}
       bootstrap_servers: {{  required "A valid .Values.kafka.bootstrap.servers entry required" .bootstrapServer | squote }}
@@ -44,19 +45,23 @@ data:
     {{- with .Values.s3 }}
       bucket_prefix: {{ required "A valid .Values.s3.bucketPrefix entry required" .bucketPrefix | squote }}
       logs_bucket_prefix: {{ required "A valid .Values.s3.logsBucketPrefix entry required" .logsBucketPrefix | squote }}
+      videos_bucket_prefix: ''
       {{- if .setPublicReadACL }}
       set_public_read_acl: {{ .setPublicReadACL }}
       {{- end }}
       key_templates:
         log: '{track_uuid}/log_{log_timestamp_ms}'
         log_prefix: '{track_uuid}/log_'
         frame: {{ include "citylens.s3_constants.frame_key_template" . | squote }}
+        videos: '{track_uuid}/{resource_type}'
       client_params:
         aws_access_key_id: {{ required "A valid .Values.s3.accessKey entry required" .accessKey | squote }}
         aws_secret_access_key: {{ required "A valid .Values.s3.secretAccessKey entry required" .secretAccessKey | squote }}
         endpoint_url: {{ required "A valid .Values.s3.endpoint entry required" .endpoint | squote }}
         region_name: {{ .region }}
         verify: {{ .verifySsl }}
+        config:
+          max_pool_connections: 10
     {{- end }}
     tracks_uploader:
       api: {{ .Values.worker.tracksUploader.api | squote }}

@@ -99,7 +99,7 @@ api:
   image:
     repository: 2gis-on-premise/citylens-api
     pullPolicy: IfNotPresent
-    tag: 1.13.1
+    tag: 1.14.2
 
   replicas: 4
 
@@ -214,6 +214,7 @@ api:
 
 # @param web.logLevel Log level.
 # @param web.metricsAppName Value for service prometheus metrics label "app_name".
+# @param web.pgPoolSize Postgres: maximum number of connections in connections pool to maintain.
 
 # @section Metadata settings
 
@@ -230,7 +231,7 @@ web:
   image:
     repository: 2gis-on-premise/citylens-web
     pullPolicy: IfNotPresent
-    tag: 1.13.0
+    tag: 1.14.2
 
   replicas: 1
 
@@ -277,6 +278,8 @@ web:
     verifySsl: true
     pkce: false
 
+  pgPoolSize: 5
+
   logLevel: WARNING
   metricsAppName: citylens-web
 
@@ -611,7 +614,7 @@ worker:
     image:
       repository: 2gis-on-premise/citylens-workers
       pullPolicy: IfNotPresent
-      tag: 1.13.0
+      tag: 1.14.2
 
     revisionHistoryLimit: 3
 
@@ -647,7 +650,7 @@ migrations:
   image:
     repository: 2gis-on-premise/citylens-database
     pullPolicy: IfNotPresent
-    tag: 1.13.0
+    tag: 1.14.0
 
   resources:
     requests:

@@ -3,7 +3,7 @@ name: dgtt
 description: DGTT Helm chart for Kubernetes
 type: application
 
-version: 1.29.0
+version: 1.30.0
 appVersion: 0.2.27-b188673e09
 
 maintainers:

@@ -3,7 +3,7 @@ name: floors-api
 description: Helm for floors service
 type: application
 
-version: 1.29.0
+version: 1.30.0
 appVersion: 1.0.4
 
 maintainers:

@@ -4,7 +4,7 @@ description: Generic library Helm chart for 2Gis
 type: library
 keywords:
 - library
-version: 1.29.0
+version: 1.30.0
 maintainers:
 - name: 2gis
   url: https://github.com/2gis

@@ -4,7 +4,7 @@ description: GIS Platform
 
 type: application
 
-version: 1.29.0
+version: 1.30.0
 appVersion: 2023.8.3-0
 
 dependencies:

@@ -84,11 +84,11 @@ See the [documentation](https://docs.2gis.com/en/on-premise/gis-platform) to lea
 | `spcore.postgres.name`                      | PostgreSQL database name **Required**                                                               | `""`                |
 | `spcore.postgres.poolsize`                  | PostgreSQL connection pool size.                                                                    | `25`                |
 | `spcore.admin`                              | **Admin access settings.**                                                                          |                     |
-| `spcore.admin.email`                        | Admin email **Required**                                                                            | `[email protected]` |
-| `spcore.admin.password`                     | Admin password **Required**                                                                         | `123456`            |
+| `spcore.admin.email`                        | Admin email **Required** Example: [email protected]                                                 | `""`                |
+| `spcore.admin.password`                     | Admin password **Required**                                                                         | `""`                |
 | `spcore.jwt`                                | **JSON Web Token (JWT) settings.**                                                                  |                     |
-| `spcore.jwt.tokenKey`                       | JWT default user token **Required**                                                                 | `supersecrettoken`  |
-| `spcore.jwt.tokenAdmin`                     | JWT admin user token **Required**                                                                   | `supersecrettoken`  |
+| `spcore.jwt.tokenKey`                       | JWT default user token **Required**                                                                 | `""`                |
+| `spcore.jwt.tokenAdmin`                     | JWT admin user token **Required**                                                                   | `""`                |
 | `spcore.catalog`                            | **Catalog settings.**                                                                               |                     |
 | `spcore.catalog.url`                        | Catalog service URL **Required** Example: `http://catalog-api`                                      | `""`                |
 | `spcore.catalog.key`                        | Catalog access key **Required**                                                                     | `""`                |

@@ -9,5 +9,5 @@ metadata:
 data:
   nginx.conf: |-
     {{- tpl (.Files.Get "configs/portal/nginx.conf.template") . | nindent 4 }}
-  default.conf.template: |-
+  default.conf: |-
     {{- tpl (.Files.Get "configs/portal/default.conf.template") . | nindent 4 }}
@@ -40,8 +40,8 @@ spec:
             {{- toYaml .Values.portal.resources | nindent 12 }}
           volumeMounts:
             - name: {{ include "gis-platform-portal.name" . }}-configmap
-              mountPath: /etc/nginx/templates/default.conf.template
-              subPath: default.conf.template
+              mountPath: /etc/nginx/conf.d/default.conf
+              subPath: default.conf
             - name: {{ include "gis-platform-portal.name" . }}-configmap
               mountPath: /etc/nginx/nginx.conf
               subPath: nginx.conf

@@ -11,7 +11,7 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-connect-timeout: {{ .Values.portal.websocket.timeout | quote }}
     nginx.ingress.kubernetes.io/proxy-read-timeout: {{ .Values.portal.websocket.timeout | quote }}
     nginx.ingress.kubernetes.io/proxy-send-timeout: {{ .Values.portal.websocket.timeout | quote }}
-    nginx.org/websocket-services: websocket
+    nginx.org/websocket-services: {{ $fullName }}
   {{- if .Values.ingress.annotations }}
     {{- with .Values.ingress.annotations }}
     {{- toYaml . | nindent 4 }}

@@ -126,20 +126,20 @@ spcore:
     poolsize: 25
 
   # @extra spcore.admin **Admin access settings.**
-  # @param spcore.admin.email Admin email **Required**
+  # @param spcore.admin.email Admin email **Required** Example: [email protected]
   # @param spcore.admin.password Admin password **Required**
 
   admin:
-    email: [email protected]
-    password: '123456'
+    email: ''
+    password: ''
 
   # @extra spcore.jwt **JSON Web Token (JWT) settings.**
   # @param spcore.jwt.tokenKey JWT default user token **Required**
   # @param spcore.jwt.tokenAdmin JWT admin user token **Required**
 
   jwt:
-    tokenKey: supersecrettoken
-    tokenAdmin: supersecrettoken
+    tokenKey: ''
+    tokenAdmin: ''
 
   # @extra spcore.catalog **Catalog settings.**
   # @param spcore.catalog.url Catalog service URL **Required** Example: `http://catalog-api`

@@ -3,7 +3,7 @@ name: keycloak
 type: application
 description: Keycloak is a high performance Java-based identity and access management solution. It lets developers add an authentication layer to their applications with minimum effort.
 
-version: 1.29.0
+version: 1.30.0
 appVersion: 21.1.1-debian-11-r4
 
 maintainers:

@@ -3,8 +3,8 @@ name: keys
 type: application
 description: A Helm chart for Kubernetes to deploy API Keys service
 
-version: 1.29.0
-appVersion: 1.87.0
+version: 1.30.0
+appVersion: 1.89.0
 
 maintainers:
 - name: 2gis