Merge branch 'develop' into feat/WAPI-23482-configure-sign

.github/scripts/check-readme.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -e
+set -u
+set -o pipefail
+
+# Define directories
+SCRIPT_DIR="$( cd $(dirname "$0") ; pwd )"
+REPO_PATH=$( git -C "$SCRIPT_DIR" rev-parse --show-toplevel )
+
+cd "$REPO_PATH"
+
+# Run the generator for each subdirectory in charts
+for chart in charts/*; do
+  if [ -d "$chart" ]; then
+    echo "Building README for $chart..."
+    readme-generator --config="$REPO_PATH/bitnami-config.json" --values="$REPO_PATH/$chart/values.yaml" --readme="$REPO_PATH/$chart/README.md"
+    echo ""
+  fi
+done
+
+# Check for unsaved changes in the repository
+IS_DIRTY=0
+HAS_UNTRACKED=0
+
+# Check for changes in README.md files in the working directory
+git -C "$REPO_PATH" diff --name-only -- '*.md' | grep -q '.' && IS_DIRTY=1
+
+# Check for changes in README.md files in the staging area
+git -C "$REPO_PATH" diff --cached --name-only -- '*.md' | grep -q '.' && IS_DIRTY=1
+
+# Check for untracked README.md files
+git -C "$REPO_PATH" ls-files --others --exclude-standard -- '*.md' | grep -q '.' && HAS_UNTRACKED=1
+
+RESULT=$(( IS_DIRTY + HAS_UNTRACKED ))
+
+if [[ "$RESULT" -eq 0 ]]; then
+  echo -e '\033[0;32mDocumentation is up-to-date\033[0m'
+else
+  echo -e '\033[0;31mYou need to update documentation: run `make prepare && make all`\033[0m'
+  echo 'Changed files:'
+  git status --porcelain | grep md
+  exit 1
+fi
+
+exit 0

.github/workflows/check-readme.yaml

@@ -0,0 +1,32 @@
+name: Check Readme Files
+
+on:
+  pull_request:
+    branches:
+      - develop
+
+jobs:
+  readme-validator:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install Node.js and npm
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
+      - name: Install readme-generator-for-helm
+        run: |
+          git clone https://github.com/bitnami/readme-generator-for-helm
+          cd readme-generator-for-helm
+          npm install
+          npm install -g .
+
+      - name: Set up script permissions
+        run: chmod +x .github/scripts/check-readme.sh
+
+      - name: Run script
+        run: .github/scripts/check-readme.sh

.gitignore

@@ -1,2 +1,3 @@
 .idea
 .DS_Store
+readme-generator-for-helm

Breaking-Changes.md

@@ -1,14 +1,14 @@
 # 2GIS On-Premise Breaking-Changes
 
-## [NEXT-VERSION]
+## [1.22.0]
 
 ## citylens
 - `kafka.predictors` is removed. Topics `kafka.predictors[0].topic` (`camcom` in values example), `kafka.predictors[1].topic` (`manual` in values example) replaced with single topic `kafka.topics.predictions`.
 
-## [1.21.0]
-
 ### pro-api
-- Added new required parameters: kafka.eventsTopic.name, kafka.eventsTopic.readerGroupId   
+- Added new required parameters: kafka.eventsTopic.name, kafka.eventsTopic.readerGroupId
+
+## [1.21.0]
 
 ### navi-restrictions
 - `api.api_key` renamed to `api.key`

CHANGELOG.md

@@ -1,5 +1,43 @@
 # 2GIS On-Premise Changelog
 
+## [1.22.0] (2024-05-02)
+#### [Breaking-Changes](Breaking-Changes.md#1220)
+#### Images
+```
+catalog-api
+	- catalog-importer:1.5.0
+	+ catalog-importer:1.7.0
+citylens
+	- citylens-api:1.7.2
+	+ citylens-api:1.8.0
+	- citylens-database:1.7.0
+	+ citylens-database:1.8.0
+	- citylens-web:1.7.2
+	+ citylens-web:1.8.0
+keys
+    - keys-ui:0.6.0
+    + keys-ui:0.7.0
+navi-castle
+	- navi-castle:1.7.0
+	+ navi-castle:1.9.2
+pro-api
+	- pro-api:1.6.0
+	+ pro-api:1.11.2
+	- pro-importer:1.6.0
+	+ pro-importer:1.11.2
+	- pro-permissions-api:1.6.0
+	+ pro-permissions-api:1.11.2
+pro-ui
+	- pro-importer:1.6.0
+	+ pro-importer:1.11.2
+	- pro-ui:2.1.1
+	+ pro-ui:2.5.1
+twins-api
+	- twins-api:1.7.3
+	+ twins-api:1.9.0
+
+```
+
 ## [1.21.0] (2024-04-02)
 #### [Breaking-Changes](Breaking-Changes.md#1210)
 #### Images

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.21.0
+version: 1.22.0
 appVersion: 3.600.0
 
 maintainers:

charts/catalog-api/README.md

@@ -195,7 +195,7 @@ 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.5.0`                            |
+| `importer.image.tag`        | Tag                                                                                           | `1.7.0`                            |
 | `importer.image.pullPolicy` | Image [Pull Policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) | `IfNotPresent`                     |
 
 ### importer.postgres **Database settings**

charts/catalog-api/values.yaml

@@ -281,7 +281,7 @@ importer:
 
   image:
     repository: 2gis-on-premise/catalog-importer
-    tag: 1.5.0
+    tag: 1.7.0
     pullPolicy: IfNotPresent
 
   # @section importer.postgres **Database settings**

charts/citylens/Chart.yaml

@@ -3,7 +3,7 @@ name: citylens
 type: application
 description: A Helm chart for Kubernetes to deploy Citylens service
 
-version: 1.21.0
+version: 1.22.0
 appVersion: 1.8.0
 
 maintainers:

charts/citylens/README.md

@@ -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.7.2`                        |
+| `api.image.tag`        | Tag.         | `1.8.0`                        |
 | `api.image.pullPolicy` | Pull Policy. | `IfNotPresent`                 |
 
 ### Resources settings
@@ -132,7 +132,7 @@ See the [documentation]() to learn about:
 | Name                   | Description  | Value                          |
 | ---------------------- | ------------ | ------------------------------ |
 | `web.image.repository` | Repository.  | `2gis-on-premise/citylens-web` |
-| `web.image.tag`        | Tag.         | `1.7.2`                        |
+| `web.image.tag`        | Tag.         | `1.8.0`                        |
 | `web.image.pullPolicy` | Pull Policy. | `IfNotPresent`                 |
 
 ### Resources settings
@@ -336,7 +336,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.7.0`                             |
+| `migrations.image.tag`                 | Tag.                                                                                                                    | `1.8.0`                             |
 | `migrations.image.pullPolicy`          | Pull Policy                                                                                                             | `IfNotPresent`                      |
 | `migrations.resources.requests.cpu`    | A CPU request.                                                                                                          | `100m`                              |
 | `migrations.resources.requests.memory` | A memory request.                                                                                                       | `1Gi`                               |
@@ -346,22 +346,19 @@ See the [documentation]() to learn about:
 
 ### Kafka settings
 
-| Name                           | Description                                                                           | Value    |
-| ------------------------------ | ------------------------------------------------------------------------------------- | -------- |
-| `kafka.bootstrapServer`        | A Kafka broker endpoint. **Required**                                                 | `""`     |
-| `kafka.username`               | A Kafka username for connection. **Required**                                         | `""`     |
-| `kafka.password`               | A Kafka password for connection. **Required**                                         | `""`     |
-| `kafka.topics.frames`          | List of topics for Frames saver worker. **Required**                                  | `""`     |
-| `kafka.topics.tracks`          | List of topics for Tracks metadata worker. **Required**                               | `""`     |
-| `kafka.topics.pro`             | Topic for frames synchronization with Pro (used by Reporter pro worker). **Required** | `""`     |
-| `kafka.topics.uploader`        | Topic for Uploader worker. **Required**                                               | `""`     |
-| `kafka.topics.logs`            | Topic for citylens mobile app logs, uploaded via citylens-api. **Required**           | `""`     |
-| `kafka.topics.framesLifecycle` | Topic for frames lifecycle events. **Required**                                       | `""`     |
-| `kafka.consumerGroups.prefix`  | Kafka topics prefix. **Required**                                                     | `""`     |
-| `kafka.predictors[0].name`     | Name of predictor **Required**                                                        | `camcom` |
-| `kafka.predictors[0].topic`    | Topic used by predictor **Required**                                                  | `""`     |
-| `kafka.predictors[1].name`     | Name of manual predictor **Required**                                                 | `manual` |
-| `kafka.predictors[1].topic`    | Topic used by manual predictor **Required**                                           | `""`     |
+| Name                           | Description                                                                           | Value |
+| ------------------------------ | ------------------------------------------------------------------------------------- | ----- |
+| `kafka.bootstrapServer`        | A Kafka broker endpoint. **Required**                                                 | `""`  |
+| `kafka.username`               | A Kafka username for connection. **Required**                                         | `""`  |
+| `kafka.password`               | A Kafka password for connection. **Required**                                         | `""`  |
+| `kafka.topics.frames`          | List of topics for Frames saver worker. **Required**                                  | `""`  |
+| `kafka.topics.tracks`          | List of topics for Tracks metadata worker. **Required**                               | `""`  |
+| `kafka.topics.pro`             | Topic for frames synchronization with Pro (used by Reporter pro worker). **Required** | `""`  |
+| `kafka.topics.uploader`        | Topic for Uploader worker. **Required**                                               | `""`  |
+| `kafka.topics.logs`            | Topic for citylens mobile app logs, uploaded via citylens-api. **Required**           | `""`  |
+| `kafka.topics.framesLifecycle` | Topic for frames lifecycle events. **Required**                                       | `""`  |
+| `kafka.topics.predictions`     | Topic for predictions events from detectors. **Required**                             | `""`  |
+| `kafka.consumerGroups.prefix`  | Kafka topics prefix. **Required**                                                     | `""`  |
 
 ### S3 settings
 

charts/citylens/templates/web/configmap.yaml

@@ -132,4 +132,4 @@ data:
         {{- end }}
       {{- end }}
       predictors:
-        {{- toYaml .Values.kafka.predictorsExtraTopics | nindent 8 }}
+        {{- toYaml (.Values.kafka.predictorsExtraTopics | default list) | nindent 8 }}

charts/dgtt/Chart.yaml

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

charts/floors-api/Chart.yaml

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

charts/generic-chart/Chart.yaml

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

charts/gis-platform/Chart.yaml

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

charts/keycloak/Chart.yaml

@@ -5,7 +5,7 @@ description: Keycloak is a high performance Java-based identity and access manag
   solution. It lets developers add an authentication layer to their applications with
   minimum effort.
 
-version: 1.21.0
+version: 1.22.0
 appVersion: 21.1.1-debian-11-r4
 
 maintainers:

charts/keys/Chart.yaml

@@ -3,7 +3,7 @@ name: keys
 type: application
 description: A Helm chart for Kubernetes to deploy API Keys service
 
-version: 1.21.0
+version: 1.22.0
 appVersion: 1.79.0
 
 maintainers:

charts/license/Chart.yaml

@@ -3,7 +3,7 @@ name: license
 type: application
 description: A Helm chart for Kubernetes to deploy License service
 
-version: 1.21.0
+version: 1.22.0
 appVersion: 2.2.1
 
 maintainers:

charts/mapgl-js-api/Chart.yaml

@@ -4,7 +4,7 @@ description: Basic WebGL map chart template for 2GIS On-Premise
 
 type: application
 
-version: 1.21.0
+version: 1.22.0
 appVersion: 1.45.1
 
 maintainers:

charts/navi-async-grpc-proxy/Chart.yaml

@@ -6,7 +6,7 @@ keywords:
 - navi
 - dm-async-matrix
 - async-grpc-proxy
-version: 1.21.0
+version: 1.22.0
 appVersion: 0.0.2
 maintainers:
 - name: 2gis

charts/navi-async-matrix/Chart.yaml

@@ -4,7 +4,7 @@ description: Service implements asynchronous API over Distance Matrix
 
 type: application
 
-version: 1.21.0
+version: 1.22.0
 appVersion: 1.6.2
 
 maintainers:

charts/navi-back/Chart.yaml

@@ -6,7 +6,7 @@ keywords:
 - navi
 - back
 - backend
-version: 1.21.0
+version: 1.22.0
 appVersion: 7.15.2.4
 maintainers:
 - name: 2gis

charts/navi-castle/Chart.yaml

@@ -4,8 +4,8 @@ description: Castle Helm chart for Kubernetes
 type: application
 
 
-version: 1.21.0
-appVersion: 1.7.0
+version: 1.22.0
+appVersion: 1.9.2
 
 maintainers:
 - name: 2gis

charts/navi-front/Chart.yaml

@@ -5,7 +5,7 @@ type: application
 keywords:
 - navi
 - front
-version: 1.21.0
+version: 1.22.0
 appVersion: 1.24.1
 maintainers:
 - name: 2gis

charts/navi-restrictions/Chart.yaml

@@ -4,8 +4,8 @@ description: A Helm chart for Kubernetes to deploy Restrictions backend
 
 type: application
 
-version: 1.21.0
-appVersion: 1.0.1
+version: 1.22.0
+appVersion: 1.24.1
 
 maintainers:
 - name: 2gis

charts/navi-router/Chart.yaml

@@ -5,8 +5,8 @@ type: application
 keywords:
 - navi
 - router
-version: 1.21.0
-appVersion: 6.17.0.8
+version: 1.22.0
+appVersion: 6.17.1.2
 maintainers:
 - name: 2gis
   url: https://github.com/2gis