Merge pull request #544 from 2gis/develop

release-1.32.0 (master)
2gis · Nov 28, 2024 · 50fc0b0 · 50fc0b0
2 parents 5fb603e + 53d0f8b
commit 50fc0b0
Show file tree

Hide file tree

Showing 75 changed files with 995 additions and 191 deletions.
diff --git a/Breaking-Changes.md b/Breaking-Changes.md
@@ -1,5 +1,11 @@
 # 2GIS On-Premise Breaking-Changes
 
+## [1.32.0]
+
+### tiles-api
+- proxy.access.bss.enabled renamed to proxy.access.stat.enabled
+- proxy.access.bss.url renamed to proxy.access.stat.url
+
 ## [1.30.0]
 
 ### pro-api

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # 2GIS On-Premise Changelog
 
+## [1.32.0] (2024-11-28)
+#### [Breaking-Changes](Breaking-Changes.md#1320)
+#### Images
+```
+citylens
+	- citylens-api:1.14.2
+	+ citylens-api:1.15.0
+	- citylens-database:1.14.0
+	+ citylens-database:1.15.0
+	- citylens-web:1.14.2
+	+ citylens-web:1.15.0
+	- citylens-workers:1.14.2
+	+ citylens-workers:1.15.0
+pro-api
+	- pro-api:1.41.0
+	+ pro-api:1.50.1
+	- pro-importer:1.41.0
+	+ pro-importer:1.50.1
+	- pro-importer:1.41.0
+	+ pro-importer:1.50.1
+	- pro-permissions-api:1.41.0
+	+ pro-permissions-api:1.50.1
+	+ pro-tasks-api:1.50.1
+pro-ui
+	- pro-importer:1.41.0
+	+ pro-importer:1.50.1
+	- pro-ui:2.27.0
+	+ pro-ui:3.5.0
+
+```
+
 ## [1.31.0] (2024-11-07)
 #### 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.31.0
+version: 1.32.0
 appVersion: 3.625.0
 
 maintainers:

diff --git a/charts/catalog-api/README.md b/charts/catalog-api/README.md
@@ -28,15 +28,16 @@ See the [documentation](https://docs.2gis.com/en/on-premise/search) to learn abo
 
 ### Common settings
 
-| Name               | Description                                                                                                                                         | Value |
-| ------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------- | ----- |
-| `nodeSelector`     | Kubernetes [node selectors](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector)                                  | `{}`  |
-| `affinity`         | Kubernetes [pod affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity)                                   | `{}`  |
-| `tolerations`      | Kubernetes [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) settings                                    | `[]`  |
-| `annotations`      | Kubernetes [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/).                                           | `{}`  |
-| `podAnnotations`   | Kubernetes [pod annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)                                        | `{}`  |
-| `podLabels`        | Kubernetes [pod labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)                                                  | `{}`  |
-| `imagePullSecrets` | Kubernetes [secrets for pulling the image from the registry](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) | `[]`  |
+| Name                 | Description                                                                                                                                         | Value |
+| -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | ----- |
+| `nodeSelector`       | Kubernetes [node selectors](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector)                                  | `{}`  |
+| `affinity`           | Kubernetes [pod affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity)                                   | `{}`  |
+| `tolerations`        | Kubernetes [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) settings                                    | `[]`  |
+| `annotations`        | Kubernetes [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/).                                           | `{}`  |
+| `podAnnotations`     | Kubernetes [pod annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)                                        | `{}`  |
+| `podLabels`          | Kubernetes [pod labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)                                                  | `{}`  |
+| `podSecurityContext` | Kubernetes [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)                                       | `{}`  |
+| `imagePullSecrets`   | Kubernetes [secrets for pulling the image from the registry](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) | `[]`  |
 
 ### Kubernetes [Pod Disruption Budget](https://kubernetes.io/docs/concepts/workloads/pods/disruptions/#pod-disruption-budgets) settings
 

diff --git a/charts/catalog-api/templates/api/deployment.yaml b/charts/catalog-api/templates/api/deployment.yaml
@@ -40,6 +40,10 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
+      {{- with .Values.podSecurityContext }}
+      securityContext:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- if .Values.api.postgres.tls.enabled }}
       initContainers:
       - name: copy-certs

diff --git a/charts/catalog-api/templates/importer/cleaner/job.yaml b/charts/catalog-api/templates/importer/cleaner/job.yaml
@@ -16,6 +16,10 @@ spec:
       labels:
         {{- include "catalog.importer.labels" . | nindent 8 }}
     spec:
+      {{- with .Values.podSecurityContext }}
+      securityContext:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       restartPolicy: Never
       {{- if .Values.importer.postgres.tls.enabled }}
       initContainers:

diff --git a/charts/catalog-api/templates/importer/job.yaml b/charts/catalog-api/templates/importer/job.yaml
@@ -16,6 +16,10 @@ spec:
       labels:
         {{- include "catalog.importer.labels" . | nindent 8 }}
     spec:
+      {{- with .Values.podSecurityContext }}
+      securityContext:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       restartPolicy: Never
       {{- if or .Values.importer.initialDelaySeconds .Values.importer.postgres.tls.enabled }}
       initContainers:

diff --git a/charts/catalog-api/values.yaml b/charts/catalog-api/values.yaml
@@ -13,6 +13,7 @@ dgctlDockerRegistry: ''
 # @param annotations Kubernetes [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/).
 # @param podAnnotations Kubernetes [pod annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)
 # @param podLabels Kubernetes [pod labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
+# @param podSecurityContext Kubernetes [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)
 # @param imagePullSecrets Kubernetes [secrets for pulling the image from the registry](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/)
 
 nodeSelector: {}
@@ -21,6 +22,7 @@ tolerations: []
 annotations: {}
 podAnnotations: {}
 podLabels: {}
+podSecurityContext: {}
 imagePullSecrets: []
 
 

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.31.0
-appVersion: 1.14.2
+version: 1.32.0
+appVersion: 1.15.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.14.2`                       |
+| `api.image.tag`        | Tag.         | `1.15.0`                       |
 | `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.14.2`                       |
+| `web.image.tag`        | Tag.         | `1.15.0`                       |
 | `web.image.pullPolicy` | Pull Policy. | `IfNotPresent`                 |
 
 ### Resources settings
@@ -352,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.14.2`                           |
+| `worker.dashboardBatchEvents.image.tag`            | Tag.                                                                                                                                           | `1.15.0`                           |
 | `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`                                |
@@ -370,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.14.0`                            |
+| `migrations.image.tag`                 | Tag.                                                                                                                    | `1.15.0`                            |
 | `migrations.image.pullPolicy`          | Pull Policy                                                                                                             | `IfNotPresent`                      |
 | `migrations.resources.requests.cpu`    | A CPU request.                                                                                                          | `100m`                              |
 | `migrations.resources.requests.memory` | A memory request.                                                                                                       | `1Gi`                               |

diff --git a/charts/citylens/templates/helpers.tpl b/charts/citylens/templates/helpers.tpl
@@ -233,8 +233,12 @@ postgresql://{{ required "A valid .Values.postgres.username entry required" .use
 {{- end -}}
 
 {{/*
-S3 key template for frames
+S3 key templates for frames & frames crops
 */}}
 {{- define "citylens.s3_constants.frame_key_template" -}}
 {track_uuid}/{frame_timestamp_ms}.jpg
 {{- end -}}
+
+{{- define "citylens.s3_constants.crop_frame_key_template" -}}
+{track_uuid}/{frame_timestamp_ms}_{theta}.jpg
+{{- end -}}
diff --git a/charts/citylens/templates/web/configmap.yaml b/charts/citylens/templates/web/configmap.yaml
@@ -53,6 +53,7 @@ data:
         log: '{track_uuid}/log_{log_timestamp_ms}'
         log_prefix: '{track_uuid}/log_'
         frame: {{ include "citylens.s3_constants.frame_key_template" . | squote }}
+        crop_frame: {{ include "citylens.s3_constants.crop_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 }}

diff --git a/charts/citylens/values.yaml b/charts/citylens/values.yaml
@@ -99,7 +99,7 @@ api:
   image:
     repository: 2gis-on-premise/citylens-api
     pullPolicy: IfNotPresent
-    tag: 1.14.2
+    tag: 1.15.0
 
   replicas: 4
 
@@ -231,7 +231,7 @@ web:
   image:
     repository: 2gis-on-premise/citylens-web
     pullPolicy: IfNotPresent
-    tag: 1.14.2
+    tag: 1.15.0
 
   replicas: 1
 
@@ -614,7 +614,7 @@ worker:
     image:
       repository: 2gis-on-premise/citylens-workers
       pullPolicy: IfNotPresent
-      tag: 1.14.2
+      tag: 1.15.0
 
     revisionHistoryLimit: 3
 
@@ -650,7 +650,7 @@ migrations:
   image:
     repository: 2gis-on-premise/citylens-database
     pullPolicy: IfNotPresent
-    tag: 1.14.0
+    tag: 1.15.0
 
   resources:
     requests:

diff --git a/charts/dgtt/Chart.yaml b/charts/dgtt/Chart.yaml
@@ -3,7 +3,7 @@ name: dgtt
 description: DGTT Helm chart for Kubernetes
 type: application
 
-version: 1.31.0
+version: 1.32.0
 appVersion: 0.2.27-b188673e09
 
 maintainers:

diff --git a/charts/floors-api/Chart.yaml b/charts/floors-api/Chart.yaml
@@ -3,7 +3,7 @@ name: floors-api
 description: Helm for floors service
 type: application
 
-version: 1.31.0
+version: 1.32.0
 appVersion: 1.1.0
 
 maintainers:

diff --git a/charts/generic-chart/Chart.yaml b/charts/generic-chart/Chart.yaml
@@ -4,7 +4,7 @@ description: Generic library Helm chart for 2Gis
 type: library
 keywords:
 - library
-version: 1.31.0
+version: 1.32.0
 maintainers:
 - name: 2gis
   url: https://github.com/2gis

diff --git a/charts/gis-platform/Chart.yaml b/charts/gis-platform/Chart.yaml
@@ -4,7 +4,7 @@ description: GIS Platform
 
 type: application
 
-version: 1.31.0
+version: 1.32.0
 appVersion: 2023.8.3-0
 
 dependencies:

diff --git a/charts/keycloak/Chart.yaml b/charts/keycloak/Chart.yaml
@@ -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.31.0
+version: 1.32.0
 appVersion: 21.1.1-debian-11-r4
 
 maintainers:

diff --git a/charts/keys/Chart.yaml b/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.31.0
+version: 1.32.0
 appVersion: 1.89.0
 
 maintainers: