Release 1.20.0 (#412)

* Twins importer (#360) * Twins importer * Twins importer add dgctlStorage settings * Twins importer fix chart * fix chart * small fix * add logs * [keys-api] up keys-backend. Support truck, map-matching api keys (#386) * Update citylens to 1.4.0 (#388) * Update citylens to 1.4.0 * bump to 1.4.1 * Feature: add codeowners file (#383) * [license] Reworked securityContext for license type 2 (#387) * [PRO-4361] Обновление pro-api до версии 1.1.79 (#382) * [PRO-4361] Обновление pro-api до версии 1.1.74 * PRO-4361: update to 1.1.77 * PRO-4371: update to 1.1.78 * PRO-4361: update to 1.1.79 * PRO-4176: add auth scopes (#365) * PRO-4176: add auth scopes * PRO-4176: update pro-ui version * PRO-4176: update app version * PRO-4176: update to 1.7.5 * navi-castle: bugfix (#393) - scheduled tasks without PV - configuration parameters mistaken * navi-restrictions-api 1.0.1 release (#392) * navi-restrictions-api 1.0.1 release * readme upd * [DEVOPS-982] navi-front: update default locations (#389) * [DEVOPS-982] navi-front: Add pedestrian location (#396) * [platform] Upgrade version (#381) * PRO-3766: update platform to 0.8.1 * Fix Breaking-Changes (#401) * generic-chart added (#398) * PRO-3609: upgrade pro ui to 1.9.0 (#399) * navi-back: upstream update 7.15.2.4 (#402) * [PRO-4517] обновил хелм-чарт pro-api в onprem до версии 1.5.0 (#394) * PRO-0: upgrade PRO API to 1.5.1 (#404) * Feature: add PR template (#410) * PRO-4774: upgraded PRO API to 1.6.0 (#407) * [PRO-4635] pro-ui, версия 2.1.1 (#405) * Citylens 1.6.0 (#406) * Update citylens to 1.5.0 * Bump appversion * Fix citylens-api configmap * Fix license server url template * Fix review notes * Update headerLinks * Add camcom to headerLinks * Fix page name in configmap * Bump to 1.5.1 * Bump to 1.6.0 * Update breaking changes & bump app version in chart * [navi-router] rename router.keyManagementServices to keys (#409) * [navi-router] Remove trailing dots in param descriptions * [navi-router] Rename router.keyManagementService -> keys * [navi-router] Rename router.castleHost -> router.castleUrl * release-1.20.0 * add breacking-changes to template
2gis · Mar 18, 2024 · ddb06df · ddb06df
1 parent 52aef0b
commit ddb06df
Show file tree

Hide file tree

Showing 61 changed files with 1,095 additions and 385 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,16 @@
+Changelog:
+
+- `Some changes` (A description of the changes proposed in the pull request.)
+
+Issues:
+
+- `Issue-123` (Link to related issue)
+
+Steps for check:
+
+- `Step 1`
+- `...`
+- `Step n-1`
+- `Step n`
+
+[Breaking-Changes](../Breaking-Changes.md)
diff --git a/Breaking-Changes.md b/Breaking-Changes.md
@@ -1,5 +1,21 @@
 # 2GIS On-Premise Breaking-Changes
 
+## [1.20.0]
+
+### navi-router
+- `router.keyManagementService.host` renamed to `router.keyManagementService.url`
+- `router.keyManagementService` renamed to `keys`
+- `router.castleHost` renamed to `router.castleUrl`
+
+### citylens
+
+- Backward compatibility for citylens 1.6.0 is broken:
+  - Parameter `api.auth.camcomToken` is replaced with `api.auth.predictorsTokens.camcom`
+  - License v2 service now required: `api.licensing.url`
+  - Parameter `map.tileserverUrl` now required
+  - Parameters group `worker.reporterProTracks` now required
+  - Database structure changed
+
 ## [1.17.0]
 
 ### citylens

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # 2GIS On-Premise Changelog
 
+## [1.20.0] (2024-03-18)
+#### [Breaking-Changes](Breaking-Changes.md#1200)
+#### Images
+```
+citylens
+	- citylens-api:1.4.1
+	+ citylens-api:1.6.0
+	- citylens-database:1.2.0
+	+ citylens-database:1.6.0
+	- citylens-web:1.4.1
+	+ citylens-web:1.6.0
+pro-api
+	- pro-api:1.5.1
+	+ pro-api:1.6.0
+	- pro-importer:1.5.1
+	+ pro-importer:1.6.0
+	- pro-importer:1.5.1
+	+ pro-importer:1.6.0
+	- pro-permissions-api:1.5.1
+	+ pro-permissions-api:1.6.0
+pro-ui
+	+ pro-importer:1.6.0
+	- pro-ui:1.9.0
+	+ pro-ui:2.1.1
+search-api
+	- search-api:7.70.0
+	+ search-api:7.74.0
+
+```
+
 ## [1.19.0] (2024-02-27)
 #### 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.19.0
+version: 1.20.0
 appVersion: 3.600.0
 
 maintainers:

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.19.0
-appVersion: 1.4.1
+version: 1.20.0
+appVersion: 1.6.0
 
 maintainers:
 - name: 2gis

diff --git a/charts/citylens/README.md b/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.4.1`                        |
+| `api.image.tag`        | Tag.         | `1.6.0`                        |
 | `api.image.pullPolicy` | Pull Policy. | `IfNotPresent`                 |
 
 ### Resources settings
@@ -91,7 +91,18 @@ See the [documentation]() to learn about:
 | `api.auth.authServerUrl` | API URL of authentication service, OIDC-compatibility expected. Ex.: `http(s)://keycloak.ingress.host/`. **Required**                                                                                         | `""`   |
 | `api.auth.realm`         | Authentication realm. Used for constructing openid-configuration endpoint: `/realms/realm/.well-known/openid-configuration` if realm defined, `/.well-known/openid-configuration` othervise. Ex: CityLens_app | `""`   |
 | `api.auth.verifySsl`     | Enable\Disable SSL check.                                                                                                                                                                                     | `true` |
-| `api.auth.camcomToken`   | Bearer token, expected on CamCom callback endpoint (if integration with CamCom enabled).                                                                                                                      | `""`   |
+
+### Bearer tokens for callbacks & predictors
+
+| Name                               | Description                                                                                                             | Value |
+| ---------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----- |
+| `api.auth.predictorsTokens.camcom` | Bearer token, expected on CamCom callback endpoint and CamCom prediction endpoint (if integration with CamCom enabled). | `""`  |
+
+### Licensing server settings
+
+| Name                | Description                                                | Value |
+| ------------------- | ---------------------------------------------------------- | ----- |
+| `api.licensing.url` | Licensing server v2 URL. https://license.svc. **Required** | `""`  |
 
 ### Custom settings
 
@@ -121,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.4.1`                        |
+| `web.image.tag`        | Tag.         | `1.6.0`                        |
 | `web.image.pullPolicy` | Pull Policy. | `IfNotPresent`                 |
 
 ### Resources settings
@@ -262,7 +273,7 @@ See the [documentation]() to learn about:
 | `worker.logsSaver.tolerations`    | Kubernetes pod [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) settings.       | `{}`  |
 | `worker.logsSaver.affinity`       | Kubernetes pod [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity) settings. | `{}`  |
 
-### Citylens Reporter Pro worker's settings
+### Citylens Reporter Pro worker's settings (synchronization with Pro)
 
 | Name                                | Description                                                                                                                 | Value |
 | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | ----- |
@@ -275,6 +286,19 @@ See the [documentation]() to learn about:
 | `worker.reporterPro.tolerations`    | Kubernetes pod [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) settings.       | `{}`  |
 | `worker.reporterPro.affinity`       | Kubernetes pod [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity) settings. | `{}`  |
 
+### Citylens Reporter Pro Tracks worker's settings (track status actualization)
+
+| Name                                      | Description                                                                                                                 | Value |
+| ----------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | ----- |
+| `worker.reporterProTracks.replicas`       | A replica count for the pod.                                                                                                | `1`   |
+| `worker.reporterProTracks.annotations`    | Kubernetes [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/).                   | `{}`  |
+| `worker.reporterProTracks.labels`         | Kubernetes [labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/).                             | `{}`  |
+| `worker.reporterProTracks.podAnnotations` | Kubernetes [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/).                   | `{}`  |
+| `worker.reporterProTracks.podLabels`      | Kubernetes [labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/).                             | `{}`  |
+| `worker.reporterProTracks.nodeSelector`   | Kubernetes pod [node selectors](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector).     | `{}`  |
+| `worker.reporterProTracks.tolerations`    | Kubernetes pod [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) settings.       | `{}`  |
+| `worker.reporterProTracks.affinity`       | Kubernetes pod [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity) settings. | `{}`  |
+
 ### Citylens Track Metadata Saver worker's settings
 
 | Name                                       | Description                                                                                                                 | Value |
@@ -312,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.2.0`                             |
+| `migrations.image.tag`                 | Tag.                                                                                                                    | `1.6.0`                             |
 | `migrations.image.pullPolicy`          | Pull Policy                                                                                                             | `IfNotPresent`                      |
 | `migrations.resources.requests.cpu`    | A CPU request.                                                                                                          | `100m`                              |
 | `migrations.resources.requests.memory` | A memory request.                                                                                                       | `1Gi`                               |
@@ -364,24 +388,25 @@ See the [documentation]() to learn about:
 
 ### Map settings
 
-| Name                     | Description                            | Value |
-| ------------------------ | -------------------------------------- | ----- |
-| `map.mapgl.host`         | Hostname of mapgl server. **Required** | `""`  |
-| `map.mapgl.key`          | Key of mapgl server. **Required**      | `""`  |
-| `map.projects[0].name`   | Name of project.                       | `""`  |
-| `map.projects[0].coords` | Coordinates of area.                   | `[]`  |
-| `map.initialProject`     | Default project shown on Map.          | `""`  |
+| Name                     | Description                                                | Value |
+| ------------------------ | ---------------------------------------------------------- | ----- |
+| `map.tileserverUrl`      | URL template for tileserver. Ex.: `http://tileserver.host` | `""`  |
+| `map.mapgl.host`         | Hostname of mapgl server. **Required**                     | `""`  |
+| `map.mapgl.key`          | Key of mapgl server. **Required**                          | `""`  |
+| `map.projects[0].name`   | Name of project.                                           | `""`  |
+| `map.projects[0].coords` | Coordinates of area.                                       | `[]`  |
+| `map.initialProject`     | Default project shown on Map.                              | `""`  |
 
 ### Custom settings
 
-| Name                            | Description                                                                                                      | Value                        |
-| ------------------------------- | ---------------------------------------------------------------------------------------------------------------- | ---------------------------- |
-| `dashboardDomain`               | Link to Citylens web address. **Required**                                                                       | `""`                         |
-| `locale`                        | Locale language (en by default).                                                                                 | `en`                         |
-| `headerLinks`                   | List of links for navbar.                                                                                        | `["drivers","tracks","map"]` |
-| `reporters[0].name`             | Reporter name.                                                                                                   | `pro`                        |
-| `reporters[0].predictors`       | Predictor used by reporter.                                                                                      | `["camcom"]`                 |
-| `reporters[0].trackTimeoutDays` | Time in days to wait for track completion and receiving frames prediction before marking as not synced with Pro. | `1`                          |
+| Name                            | Description                                                                                                      | Value                                         |
+| ------------------------------- | ---------------------------------------------------------------------------------------------------------------- | --------------------------------------------- |
+| `dashboardDomain`               | Link to Citylens web address. **Required**                                                                       | `""`                                          |
+| `locale`                        | Locale language (en by default).                                                                                 | `en`                                          |
+| `headerLinks`                   | List of links for navbar.                                                                                        | `["drivers","tracks","interest_zones","map"]` |
+| `reporters[0].name`             | Reporter name.                                                                                                   | `pro`                                         |
+| `reporters[0].predictors`       | Predictor used by reporter.                                                                                      | `["camcom"]`                                  |
+| `reporters[0].trackTimeoutDays` | Time in days to wait for track completion and receiving frames prediction before marking as not synced with Pro. | `1`                                           |
 
 ### PRO integration (only when Pro reporter enabled)
 

diff --git a/charts/citylens/templates/api/configmap.yaml b/charts/citylens/templates/api/configmap.yaml
@@ -38,10 +38,17 @@ data:
       {{- if .realm }}
       realm: {{ .realm | quote }}
       {{- end}}
-      {{- if .camcomToken }}
-      camcom_token: {{ .camcomToken | quote }}
+      predictor_tokens:
+        {{- .predictorsTokens | toYaml | nindent 8 }}
       {{- end }}
+    {{- end }}
+    {{- with .Values.api.licensing }}
+    pasportool:
+      {{- if .enabled }}
+      enabled: {{ .enabled }}
       {{- end }}
+      client_params:
+        endpoint_url: {{ required "A valid .Values.api.licensing.url entry required" .url | quote }}
     {{- end }}
     show_docs: {{ .Values.api.showDocs }}
     log_level: {{ .Values.api.logLevel }}

diff --git a/charts/citylens/templates/helpers.tpl b/charts/citylens/templates/helpers.tpl
@@ -33,6 +33,10 @@ Expand the name of the chart.
 {{ include "citylens.name" . }}-reporter-pro
 {{- end }}
 
+{{- define "citylens.reporter-pro-tracks.name" -}}
+{{ include "citylens.name" . }}-reporter-pro-tracks
+{{- end }}
+
 {{- define "citylens.secret.import.name" -}}
 {{ include "citylens.name" . }}-import-secret
 {{- end }}
@@ -110,6 +114,11 @@ app.kubernetes.io/name: {{ .Release.Name }}
 app.kubernetes.io/instance: {{ include "citylens.reporter-pro.name" . }}
 {{- end }}
 
+{{- define "citylens.reporter-pro-tracks.selectorLabels" -}}
+app.kubernetes.io/name: {{ .Release.Name }}
+app.kubernetes.io/instance: {{ include "citylens.reporter-pro-tracks.name" . }}
+{{- end }}
+
 {{- define "citylens.track-reloader.selectorLabels" -}}
 app.kubernetes.io/name: {{ .Release.Name }}
 app.kubernetes.io/instance: {{ include "citylens.track-reloader.name" . }}
@@ -125,6 +134,11 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 
+{{- define "citylens.reporter-pro-tracks.labels" -}}
+{{ include "citylens.reporter-pro-tracks.selectorLabels" . }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+
 {{- define "citylens.track-metadata-saver.selectorLabels" -}}
 app.kubernetes.io/name: {{ .Release.Name }}
 app.kubernetes.io/instance: {{ include "citylens.track-metadata-saver.name" . }}

diff --git a/charts/citylens/templates/web/configmap.yaml b/charts/citylens/templates/web/configmap.yaml
@@ -87,6 +87,7 @@ data:
       verify_ssl: {{ .verifySsl }}
     {{- end }}
     map:
+      tileserver_url_template: {{ required "A valid .Values.map.tileserverUrl entry required" .Values.map.tileserverUrl }}/tiles?x={x}&y={y}&z={z}
       mapgl:
         host: {{ required "A valid .Values.map.mapgl.host entry required" .Values.map.mapgl.host | squote }}
         key: {{ required "A valid .Values.map.mapgl.key entry required" .Values.map.mapgl.key | squote }}
@@ -103,6 +104,9 @@ data:
         - reload_track
         - reload_statuses
         {{- end }}
+        {{- if .Values.worker.camcomSender.enabled }}
+        - camcom_stats
+        {{- end }}
         {{- if .Values.pro.url }}
         - pro
         {{- end }}

diff --git a/charts/citylens/templates/worker/deployment-reporter-pro-tracks.yaml b/charts/citylens/templates/worker/deployment-reporter-pro-tracks.yaml
@@ -0,0 +1,63 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "citylens.reporter-pro-tracks.name" . }}
+  {{- if .Values.worker.reporterProTracks.annotations }}
+  annotations:
+    {{- toYaml .Values.worker.reporterProTracks.annotations | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "citylens.reporter-pro-tracks.labels" . | nindent 4 }}
+  {{- if .Values.worker.reporterProTracks.labels }}
+    {{- toYaml .Values.worker.reporterProTracks.labels | nindent 4 }}
+  {{- end }}
+spec:
+  replicas: {{ .Values.worker.reporterProTracks.replicas }}
+  selector:
+    matchLabels:
+      {{- include "citylens.reporter-pro-tracks.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/web/configmap.yaml") . | sha256sum }}
+      {{- with .Values.worker.reporterProTracks.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "citylens.reporter-pro-tracks.labels" . | nindent 8 }}
+    spec:
+      containers:
+        - name: {{ include "citylens.reporter-pro-tracks.name" . }}
+          image: {{ required "A valid .Values.dgctlDockerRegistry entry required" .Values.dgctlDockerRegistry }}/{{ .Values.web.image.repository }}:{{ .Values.web.image.tag }}
+          imagePullPolicy: {{ .Values.web.image.pullPolicy }}
+          command: [ "/bin/sh", "-c" ]
+          args: [ "flask reporter run-pro-tracks" ]
+          env:
+            - name: CONFIG_PATH
+              value: /opt/worker/config/dashboard_config.yaml
+          resources:
+            {{- toYaml .Values.worker.resources | nindent 12 }}
+          volumeMounts:
+            - name: config-volume
+              mountPath: /opt/worker/config
+      volumes:
+        - name: config-volume
+          configMap:
+            name: {{ include "citylens.web.name" . }}-configmap
+      {{- with .Values.worker.reporterProTracks.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.worker.reporterProTracks.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.worker.reporterProTracks.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}