Merge master

CHANGELOG.md

@@ -1,5 +1,25 @@
 # 2GIS On-Premise Changelog
 
+## [1.31.0] (2024-11-07)
+#### Images
+```
+floors-api
+	- floors-importer:1.0.4
+	+ floors-importer:1.1.0
+	- floors-nodejs:1.0.4
+	+ floors-nodejs:1.1.0
+mapgl-js-api
+	- mapgl:1.51.0
+	+ mapgl:1.53.0
+navi-back
+	- navi-back:7.27.1.2
+	+ navi-back:7.29.2.2
+search-api
+	- search-api:7.80.0
+	+ search-api:7.85.0
+
+```
+
 ## [1.30.0] (2024-10-24)
 #### [Breaking-Changes](Breaking-Changes.md#1300)
 #### 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.30.0
+version: 1.31.0
 appVersion: 3.625.0
 
 maintainers:

charts/citylens/Chart.yaml

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

charts/dgtt/Chart.yaml

@@ -3,7 +3,7 @@ name: dgtt
 description: DGTT Helm chart for Kubernetes
 type: application
 
-version: 1.30.0
+version: 1.31.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.30.0
+version: 1.31.0
 appVersion: 1.1.0
 
 maintainers:

charts/floors-api/README.md

@@ -18,7 +18,7 @@ Read more about the On-Premise solution [here](https://docs.2gis.com/en/on-premi
 | ------------------------- | -------------------------------- | ------------------------------- |
 | `nodejs.image.repository` | Floors backend image repository. | `2gis-on-premise/floors-nodejs` |
 | `nodejs.image.pullPolicy` | Floors backend pull policy.      | `IfNotPresent`                  |
-| `nodejs.image.tag`        | Floors backend image tag.        | `1.0.4`                         |
+| `nodejs.image.tag`        | Floors backend image tag.        | `1.1.0`                         |
 | `nginx.image.repository`  | Floors nginx image repository.   | `2gis-on-premise/nginx`         |
 | `nginx.image.pullPolicy`  | Floors nginx pull policy.        | `IfNotPresent`                  |
 | `nginx.image.tag`         | Floors nginx image tag.          | `1.21.6`                        |
@@ -102,7 +102,7 @@ Read more about the On-Premise solution [here](https://docs.2gis.com/en/on-premi
 | Name                               | Description                      | Value                             |
 | ---------------------------------- | -------------------------------- | --------------------------------- |
 | `import.image.repository`          | Import task image repository.    | `2gis-on-premise/floors-importer` |
-| `import.image.tag`                 | Import task image tag.           | `1.0.4`                           |
+| `import.image.tag`                 | Import task image tag.           | `1.1.0`                           |
 | `import.image.pullPolicy`          | Import task pull policy.         | `IfNotPresent`                    |
 | `import.resources.requests.cpu`    | A CPU request, e.g., `100m`.     |                                   |
 | `import.resources.requests.memory` | A memory request, e.g., `128Mi`. |                                   |

charts/floors-api/values.yaml

@@ -129,7 +129,7 @@ nodejs:
   image:
     repository: 2gis-on-premise/floors-nodejs
     pullPolicy: IfNotPresent
-    tag: 1.0.4
+    tag: 1.1.0
 
 
 # @section Floors nginx settings
@@ -165,7 +165,7 @@ import:
   image:
     repository: 2gis-on-premise/floors-importer
     pullPolicy: IfNotPresent
-    tag: 1.0.4
+    tag: 1.1.0
 
 # @section **Custom Certificate Authority**
 

charts/generic-chart/Chart.yaml

@@ -4,7 +4,7 @@ description: Generic library Helm chart for 2Gis
 type: library
 keywords:
 - library
-version: 1.30.0
+version: 1.31.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.30.0
+version: 1.31.0
 appVersion: 2023.8.3-0
 
 dependencies:

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.30.0
+version: 1.31.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.30.0
+version: 1.31.0
 appVersion: 1.89.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.30.0
+version: 1.31.0
 appVersion: 2.2.3
 
 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.30.0
+version: 1.31.0
 appVersion: 1.53.0
 
 maintainers:

charts/mapgl-js-api/README.md

@@ -46,7 +46,7 @@ See the [documentation](https://docs.2gis.com/en/on-premise/map) to learn about:
 | Name               | Description | Value                   |
 | ------------------ | ----------- | ----------------------- |
 | `image.repository` | Repository  | `2gis-on-premise/mapgl` |
-| `image.tag`        | Tag         | `1.51.0`                |
+| `image.tag`        | Tag         | `1.53.0`                |
 | `image.pullPolicy` | Pull Policy | `IfNotPresent`          |
 
 ### Environment variables

charts/mapgl-js-api/values.yaml

@@ -38,7 +38,7 @@ podLabels: {}
 
 image:
   repository: 2gis-on-premise/mapgl
-  tag: 1.51.0
+  tag: 1.53.0
   pullPolicy: IfNotPresent
 
 

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

@@ -6,7 +6,7 @@ keywords:
 - navi
 - dm-async-matrix
 - async-grpc-proxy
-version: 1.30.0
+version: 1.31.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.30.0
+version: 1.31.0
 appVersion: 1.11.2
 
 maintainers:

charts/navi-back/Chart.yaml

@@ -6,8 +6,8 @@ keywords:
 - navi
 - back
 - backend
-version: 1.30.0
-appVersion: 7.27.1.2
+version: 1.31.0
+appVersion: 7.29.2.2
 dependencies:
 - name: generic-chart
   version: '*'

charts/navi-back/README.md

@@ -78,7 +78,7 @@ See the [documentation](https://docs.2gis.com/en/on-premise/navigation) to learn
 | Name               | Description | Value                       |
 | ------------------ | ----------- | --------------------------- |
 | `image.repository` | Repository  | `2gis-on-premise/navi-back` |
-| `image.tag`        | Tag         | `7.27.1.2`                  |
+| `image.tag`        | Tag         | `7.29.2.2`                  |
 | `image.pullPolicy` | Pull Policy | `IfNotPresent`              |
 
 ### Navi-Back application settings
@@ -88,6 +88,8 @@ See the [documentation](https://docs.2gis.com/en/on-premise/navigation) to learn
 | `naviback.ecaHost`                                      | DEPRECATED: Use naviback.ecaUrl. Domain name of the [Traffic Proxy service](https://docs.2gis.com/en/on-premise/traffic-proxy). <br> This URL should be accessible from all the pods within your Kubernetes cluster |                                          |
 | `naviback.ecaUrl`                                       | URL of the [Traffic Proxy service](https://docs.2gis.com/en/on-premise/traffic-proxy). <br> This URL should be accessible from all the pods within your Kubernetes cluster                                          |                                          |
 | `naviback.forecastHost`                                 | URL of Traffic forecast service. See the [Traffic Proxy service](https://docs.2gis.com/en/on-premise/traffic-proxy). <br> This URL should be accessible from all the pods within your Kubernetes cluster            |                                          |
+| `naviback.walkingUserSpeedsUrl`                         | URL of walking user speeds                                                                                                                                                                                          |                                          |
+| `naviback.routeAsUsualUrl`                              | URL of route as usual                                                                                                                                                                                               |                                          |
 | `naviback.dmSourcesLimit`                               | Size limit for source matrices                                                                                                                                                                                      | `1000`                                   |
 | `naviback.dmTargetsLimit`                               | Size limit for target matrices                                                                                                                                                                                      | `1000`                                   |
 | `naviback.handlersNumber`                               | Total number of HTTP/GRPC handlers                                                                                                                                                                                  | `1`                                      |
@@ -99,6 +101,7 @@ See the [documentation](https://docs.2gis.com/en/on-premise/navigation) to learn
 | `naviback.timeoutIncrementSec`                          | Downloading time increment after failures                                                                                                                                                                           | `140`                                    |
 | `naviback.totalRetryDurationSec`                        | Downloading timeout with all failure retries                                                                                                                                                                        | `2400`                                   |
 | `naviback.initialRetryIntervalSec`                      | Initial timeout for a failure retry                                                                                                                                                                                 | `2`                                      |
+| `naviback.clearCacheThreshold`                          | Memory usage percentage threshold to run cache cleanup                                                                                                                                                              | `90`                                     |
 | `naviback.dump.result`                                  | Dump results in logs                                                                                                                                                                                                | `false`                                  |
 | `naviback.dump.query`                                   | Dump queries in logs                                                                                                                                                                                                | `false`                                  |
 | `naviback.dump.answer`                                  | Dump answers in logs                                                                                                                                                                                                | `false`                                  |
@@ -161,25 +164,28 @@ See the [documentation](https://docs.2gis.com/en/on-premise/navigation) to learn
 | `naviback.validation.isochrone.requestSchemaName`       | Name of isochrone request validation schema                                                                                                                                                                         | `IsochroneApiRequestModel.json`          |
 | `naviback.validation.isochrone.responseSchemaName`      | Name of isochrone response validation schema                                                                                                                                                                        | `IsochroneApiResponseModel.json`         |
 | `naviback.tilesMetricsThreshold`                        | The value at which we send tiles metrics (used for internal tests)                                                                                                                                                  | `0`                                      |
+| `naviback.engineUpdatePeriodSec`                        | The time interval between engine updates                                                                                                                                                                            | `30`                                     |
 | `naviback.hierarchies.enabled`                          | If SN cache available                                                                                                                                                                                               | `false`                                  |
 | `naviback.hierarchies.skipPatches`                      | Skip patches in hierarchies cache, ignored if skipShortcuts set                                                                                                                                                     | `false`                                  |
 | `naviback.hierarchies.skipShortcuts`                    | Skip shortcuts in SN cache                                                                                                                                                                                          | `false`                                  |
 | `naviback.hierarchies.s3path`                           | Hierarchies cache remote location                                                                                                                                                                                   | `""`                                     |
+| `naviback.hierarchies.volume`                           | Hierarchies local cache specification. Leave empty for default emptydir.                                                                                                                                            | `{}`                                     |
 | `naviback.etaScheduleIndex.enabled`                     | If Schedule Index available                                                                                                                                                                                         | `false`                                  |
 | `naviback.etaScheduleIndex.url`                         | Schedule Index remote url                                                                                                                                                                                           | `""`                                     |
 
 ### Envoy settings, ignored if not `transmitter.enabled`. Leave with defaults, FOR FUTURE RELEASE.
 
-| Name                              | Description                                | Value                   |
-| --------------------------------- | ------------------------------------------ | ----------------------- |
-| `envoy.image.repository`          | Repository                                 | `2gis-on-premise/envoy` |
-| `envoy.image.tag`                 | Tag                                        | `v1.27.0`               |
-| `envoy.image.pullPolicy`          | Pull Policy                                | `IfNotPresent`          |
-| `envoy.resources`                 | Container resources requirements structure | `{}`                    |
-| `envoy.resources.requests.cpu`    | CPU request, recommended value `100m`      | `undefined`             |
-| `envoy.resources.requests.memory` | Memory request, recommended value `100Mi`  | `undefined`             |
-| `envoy.resources.limits.cpu`      | CPU limit, recommended value `100m`        | `undefined`             |
-| `envoy.resources.limits.memory`   | Memory limit, recommended value `100Mi`    | `undefined`             |
+| Name                              | Description                                                                                  | Value                   |
+| --------------------------------- | -------------------------------------------------------------------------------------------- | ----------------------- |
+| `envoy.image.repository`          | Repository                                                                                   | `2gis-on-premise/envoy` |
+| `envoy.image.tag`                 | Tag                                                                                          | `v1.27.0`               |
+| `envoy.image.pullPolicy`          | Pull Policy                                                                                  | `IfNotPresent`          |
+| `envoy.concurrency`               | The number of worker threads to run. Use `max(1, floor(resources.limits.cpu))` if set to `0` | `""`                    |
+| `envoy.resources`                 | Container resources requirements structure                                                   | `{}`                    |
+| `envoy.resources.requests.cpu`    | CPU request, recommended value `100m`                                                        | `undefined`             |
+| `envoy.resources.requests.memory` | Memory request, recommended value `100Mi`                                                    | `undefined`             |
+| `envoy.resources.limits.cpu`      | CPU limit, recommended value `100m`                                                          | `undefined`             |
+| `envoy.resources.limits.memory`   | Memory limit, recommended value `100Mi`                                                      | `undefined`             |
 
 ### Service account settings
 

charts/navi-back/templates/_helpers.tpl

@@ -408,3 +408,16 @@ Usage:
 {{- define "custom.ca.mountPath" -}}
 {{ .Values.customCAs.certsPath | default "/usr/local/share/ca-certificates" }}
 {{- end -}}
+
+{{/*
+Calculate envoy --concurrency value
+*/}}
+{{- define "envoy.get-concurrency" }}
+    {{- if ne 0 (.Values.envoy.concurrency | int) }}
+        {{- max 1 (.Values.envoy.concurrency | int) -}}
+    {{- else if (.Values.envoy.resources.limits).cpu }}
+        {{- max 1 (include "generic-chart.parse-resource-quantity" .Values.envoy.resources.limits.cpu | floor | int) }}
+    {{- else }}
+        {{- printf "1" -}}
+    {{- end }}
+{{- end }}

charts/navi-back/templates/configmap.yaml

@@ -466,6 +466,28 @@ data:
           }
         },
         {{- end }}{{- /* .Values.naviback.indices.snImport.enabled */}}
+        {{- if .Values.naviback.indices.routeAsUsual.enabled }}
+        "route_as_usual": {
+          "update_period": 0,
+          "nodes": [
+            "{{ .Values.naviback.routeAsUsualUrl }}"
+          ],
+          "timeout_seconds": {
+            "count": 60
+          }
+        },
+        {{- end }}{{- /* .Values.naviback.indices.routeAsUsual.enabled */}}
+        {{- if .Values.naviback.indices.walkingUserSpeeds.enabled }}
+        "walking_user_speeds": {
+          "update_period": 0,
+          "nodes": [
+            "{{ .Values.naviback.walkingUserSpeedsUrl }}"
+          ],
+          "timeout_seconds": {
+            "count": 60
+          }
+        },
+        {{- end }}{{- /* .Values.naviback.indices.walkingUserSpeeds.enabled */}}
         {{- if .Values.naviback.indices.geoImport.enabled }}
         "geo_import": {
           "update_period": 0,
@@ -663,7 +685,8 @@ data:
           "dump_answer": {{ mustToJson (.Values.naviback.dump).answer }},
           "max_parallel_workers": 2,
           "use_memory_mapped_vfs": true,
-          "engine_update_period_sec": {{ include "config.setEngineUpdatePeriod" $ | default 30 }},
+          "clear_cache_threshold": {{ .Values.naviback.clearCacheThreshold | int }},
+          "engine_update_period_sec": {{ include "config.setEngineUpdatePeriod" $ | default .Values.naviback.engineUpdatePeriodSec }},
           {{- if .Values.naviback.server_id }}
           "server_id": "{{- include "tplvalues.render" ( dict "value" .Values.naviback.server_id "context" .) }}",
           {{- else }}