diff --git a/.github/workflows/mm-release-notify.yaml b/.github/workflows/mm-release-notify.yaml index bb75c0b83..64589ffaa 100644 --- a/.github/workflows/mm-release-notify.yaml +++ b/.github/workflows/mm-release-notify.yaml @@ -23,5 +23,5 @@ jobs: 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 + Опубликован On-Premise: ${{ github.event.workflow_run.head_branch }} + Документация: https://confluence.2gis.ru/display/ONPREM/Release+${{ github.event.workflow_run.head_branch }}+On-Premise diff --git a/CHANGELOG.md b/CHANGELOG.md index f2fb5d692..def02e2f2 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/charts/catalog-api/Chart.yaml b/charts/catalog-api/Chart.yaml index 861982e1a..c150e2065 100644 --- 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.30.0 +version: 1.31.0 appVersion: 3.625.0 maintainers: diff --git a/charts/citylens/Chart.yaml b/charts/citylens/Chart.yaml index f8cc8d890..3b4671113 100644 --- a/charts/citylens/Chart.yaml +++ b/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: diff --git a/charts/dgtt/Chart.yaml b/charts/dgtt/Chart.yaml index bded37c3f..3797aab93 100644 --- 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.30.0 +version: 1.31.0 appVersion: 0.2.27-b188673e09 maintainers: diff --git a/charts/floors-api/Chart.yaml b/charts/floors-api/Chart.yaml index dcca97988..fcc395efe 100644 --- a/charts/floors-api/Chart.yaml +++ b/charts/floors-api/Chart.yaml @@ -3,8 +3,8 @@ name: floors-api description: Helm for floors service type: application -version: 1.30.0 -appVersion: 1.0.4 +version: 1.31.0 +appVersion: 1.1.0 maintainers: - name: 2gis diff --git a/charts/floors-api/README.md b/charts/floors-api/README.md index ca22ca032..887a2769f 100644 --- a/charts/floors-api/README.md +++ b/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,9 +102,16 @@ 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`. | | | `import.resources.limits.cpu` | A CPU limit, e.g., `100m`. | | | `import.resources.limits.memory` | A memory limit, e.g., `128Mi`. | | + +### **Custom Certificate Authority** + +| Name | Description | Value | +| --------------------- | --------------------------------------------------------------------------------------------------------------------------- | ----- | +| `customCAs.bundle` | Custom CA [text representation of the X.509 PEM public-key certificate](https://www.rfc-editor.org/rfc/rfc7468#section-5.1) | `""` | +| `customCAs.certsPath` | Custom CA bundle mount directory in the container. | `""` | diff --git a/charts/floors-api/templates/_helpers.tpl b/charts/floors-api/templates/_helpers.tpl index 2c779c3d1..b7dd3acf3 100644 --- a/charts/floors-api/templates/_helpers.tpl +++ b/charts/floors-api/templates/_helpers.tpl @@ -67,3 +67,14 @@ Return the appropriate apiVersion for Horizontal Pod Autoscaler. {{- print "autoscaling/v2" -}} {{- end -}} {{- end -}} + +{{/* +Mount directory for custom CA +*/}} +{{- define "floors.customCA.mountPath" -}} +{{ $.Values.customCAs.certsPath | default "/usr/local/share/ca-certificates" }} +{{- end -}} + +{{- define "floors.checksum" -}} +{{ (include (print $.Template.BasePath .path) $ | fromYaml).data | toYaml | sha256sum }} +{{- end }} diff --git a/charts/floors-api/templates/custom-ca.configmap.yaml b/charts/floors-api/templates/custom-ca.configmap.yaml new file mode 100644 index 000000000..01c05c359 --- /dev/null +++ b/charts/floors-api/templates/custom-ca.configmap.yaml @@ -0,0 +1,13 @@ +{{- if $.Values.customCAs.bundle }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "floors.fullname" . }}-custom-ca + labels: + {{- include "floors.labels" . | nindent 4 }} + +data: + custom-ca.crt: |- + {{- $.Values.customCAs.bundle | nindent 4 }} +{{- end }} diff --git a/charts/floors-api/templates/deployment.yaml b/charts/floors-api/templates/deployment.yaml index 0a96741a3..95e9c9f33 100644 --- a/charts/floors-api/templates/deployment.yaml +++ b/charts/floors-api/templates/deployment.yaml @@ -27,6 +27,7 @@ spec: metadata: {{- with .Values.podAnnotations }} annotations: + checksum/custom-ca: {{ include "floors.checksum" (merge (dict "path" "/custom-ca.configmap.yaml") $) }} checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} {{- toYaml . | nindent 8 }} {{- end }} @@ -60,9 +61,19 @@ spec: value: "{{ .Values.dgctlStorage.region }}" - name: IMPORTER_S3_SECURE value: "{{ .Values.dgctlStorage.secure }}" + {{- if $.Values.customCAs.bundle }} + - name: IMPORTER_SSL_CERT_FILE + value: {{ include "floors.customCA.mountPath" $ }}/custom-ca.crt + {{- end }} volumeMounts: - name: {{ include "floors.fullname" $ }}-data mountPath: "/var/floorsConvertedData" + {{- if $.Values.customCAs.bundle }} + - name: custom-ca + mountPath: {{ include "floors.customCA.mountPath" $ }}/custom-ca.crt + subPath: custom-ca.crt + readOnly: true + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} containers: @@ -146,6 +157,11 @@ spec: path: servers.conf - name: {{ include "floors.fullname" $ }}-data emptyDir: {} + {{- if $.Values.customCAs.bundle }} + - name: custom-ca + configMap: + name: {{ include "floors.fullname" $ }}-custom-ca + {{- end }} {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} diff --git a/charts/floors-api/values.yaml b/charts/floors-api/values.yaml index e2c35d9e5..dd0f4cbb4 100644 --- a/charts/floors-api/values.yaml +++ b/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,4 +165,17 @@ import: image: repository: 2gis-on-premise/floors-importer pullPolicy: IfNotPresent - tag: 1.0.4 + tag: 1.1.0 + +# @section **Custom Certificate Authority** + +# @param customCAs.bundle Custom CA [text representation of the X.509 PEM public-key certificate](https://www.rfc-editor.org/rfc/rfc7468#section-5.1) +# @param customCAs.certsPath Custom CA bundle mount directory in the container. + +customCAs: + bundle: '' + # bundle: | + # -----BEGIN CERTIFICATE----- + # ... + # -----END CERTIFICATE----- + certsPath: '' diff --git a/charts/generic-chart/Chart.yaml b/charts/generic-chart/Chart.yaml index 9f7dc0f55..535fdfce2 100644 --- 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.30.0 +version: 1.31.0 maintainers: - name: 2gis url: https://github.com/2gis diff --git a/charts/gis-platform/Chart.yaml b/charts/gis-platform/Chart.yaml index 98388be68..3390b162f 100644 --- a/charts/gis-platform/Chart.yaml +++ b/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: diff --git a/charts/keycloak/Chart.yaml b/charts/keycloak/Chart.yaml index 1ab557058..32a1eb3b1 100644 --- 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.30.0 +version: 1.31.0 appVersion: 21.1.1-debian-11-r4 maintainers: diff --git a/charts/keys/Chart.yaml b/charts/keys/Chart.yaml index eb3ef77bb..a8acd5144 100644 --- 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.30.0 +version: 1.31.0 appVersion: 1.89.0 maintainers: diff --git a/charts/license/Chart.yaml b/charts/license/Chart.yaml index 236d37a69..a88ec22fe 100644 --- a/charts/license/Chart.yaml +++ b/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: diff --git a/charts/mapgl-js-api/Chart.yaml b/charts/mapgl-js-api/Chart.yaml index 66773891d..bc8b75087 100644 --- a/charts/mapgl-js-api/Chart.yaml +++ b/charts/mapgl-js-api/Chart.yaml @@ -4,8 +4,8 @@ description: Basic WebGL map chart template for 2GIS On-Premise type: application -version: 1.30.0 -appVersion: 1.51.0 +version: 1.31.0 +appVersion: 1.53.0 maintainers: - name: 2gis diff --git a/charts/mapgl-js-api/README.md b/charts/mapgl-js-api/README.md index e3750dbb7..7339a3b67 100644 --- a/charts/mapgl-js-api/README.md +++ b/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 diff --git a/charts/mapgl-js-api/values.yaml b/charts/mapgl-js-api/values.yaml index ab04adcc0..18c72bb1d 100644 --- a/charts/mapgl-js-api/values.yaml +++ b/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 diff --git a/charts/navi-async-grpc-proxy/Chart.yaml b/charts/navi-async-grpc-proxy/Chart.yaml index 88633c128..0076dd6c9 100644 --- a/charts/navi-async-grpc-proxy/Chart.yaml +++ b/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 diff --git a/charts/navi-async-matrix/Chart.yaml b/charts/navi-async-matrix/Chart.yaml index 621bf6a3b..b6d2a3fc7 100644 --- a/charts/navi-async-matrix/Chart.yaml +++ b/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: diff --git a/charts/navi-back/Chart.yaml b/charts/navi-back/Chart.yaml index e3c83e53c..16cfc7f0d 100644 --- a/charts/navi-back/Chart.yaml +++ b/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: '*' diff --git a/charts/navi-back/README.md b/charts/navi-back/README.md index 5fd1d63d5..94732357a 100644 --- a/charts/navi-back/README.md +++ b/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).
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).
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).
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 diff --git a/charts/navi-back/templates/_helpers.tpl b/charts/navi-back/templates/_helpers.tpl index 4bbe27c71..cfc348374 100644 --- a/charts/navi-back/templates/_helpers.tpl +++ b/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 }} diff --git a/charts/navi-back/templates/configmap.yaml b/charts/navi-back/templates/configmap.yaml index db82430ab..6aca7d436 100644 --- a/charts/navi-back/templates/configmap.yaml +++ b/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 }} diff --git a/charts/navi-back/templates/deployment.yaml b/charts/navi-back/templates/deployment.yaml index 603a9c44b..3dc27cfba 100644 --- a/charts/navi-back/templates/deployment.yaml +++ b/charts/navi-back/templates/deployment.yaml @@ -71,7 +71,11 @@ spec: {{- end }} {{- if .Values.naviback.hierarchies.enabled }} - name: hierarchies-volume + {{- if .Values.naviback.hierarchies.volume }} + {{- toYaml .Values.naviback.hierarchies.volume | nindent 8 }} + {{- else }} emptyDir: {} + {{- end }}{{- /* if .Values.naviback.hierarchies.volume */}} {{- end }} {{- if .Values.extraVolumes }} {{- include "tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 6 }} @@ -91,6 +95,15 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: {{ required "A valid .Values.dgctlDockerRegistry entry required" .Values.dgctlDockerRegistry }}/{{ .Values.envoy.image.repository }}:{{ .Values.envoy.image.tag }} imagePullPolicy: {{ .Values.envoy.image.pullPolicy }} + args: + - -c + - /etc/envoy/envoy.yaml + {{- if and (kindIs "string" .Values.envoy.concurrency) (eq "" .Values.envoy.concurrency) }} + {{/* envoy.concurrency = '', skip */}} + {{- else }} + - "--concurrency" + - {{ include "envoy.get-concurrency" . | quote }} + {{- end }} volumeMounts: - name: {{ include "generic-chart.fullname" . }}-configmap mountPath: /etc/envoy/envoy.yaml @@ -205,7 +218,7 @@ spec: mountPath: "/tmp/hierarchies" {{- end }} {{- if .Values.extraVolumeMounts }} - {{- include "tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 10 }} + {{- include "tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }} {{- end }} {{- if .Values.customCAs.bundle }} - name: {{ include "generic-chart.fullname" . }}-configmap-ca diff --git a/charts/navi-back/values.yaml b/charts/navi-back/values.yaml index de6f8d3f8..5183949d5 100644 --- a/charts/navi-back/values.yaml +++ b/charts/navi-back/values.yaml @@ -106,7 +106,7 @@ args: [] image: repository: 2gis-on-premise/navi-back pullPolicy: IfNotPresent - tag: 7.27.1.2 + tag: 7.29.2.2 # @section Navi-Back application settings @@ -114,6 +114,8 @@ image: # @extra naviback.ecaHost DEPRECATED: Use naviback.ecaUrl. Domain name of the [Traffic Proxy service](https://docs.2gis.com/en/on-premise/traffic-proxy).
This URL should be accessible from all the pods within your Kubernetes cluster # @extra naviback.ecaUrl URL of the [Traffic Proxy service](https://docs.2gis.com/en/on-premise/traffic-proxy).
This URL should be accessible from all the pods within your Kubernetes cluster # @extra naviback.forecastHost URL of Traffic forecast service. See the [Traffic Proxy service](https://docs.2gis.com/en/on-premise/traffic-proxy).
This URL should be accessible from all the pods within your Kubernetes cluster +# @extra naviback.walkingUserSpeedsUrl URL of walking user speeds +# @extra naviback.routeAsUsualUrl URL of route as usual # @skip naviback.appPort # @param naviback.dmSourcesLimit Size limit for source matrices # @param naviback.dmTargetsLimit Size limit for target matrices @@ -126,6 +128,7 @@ image: # @param naviback.timeoutIncrementSec Downloading time increment after failures # @param naviback.totalRetryDurationSec Downloading timeout with all failure retries # @param naviback.initialRetryIntervalSec Initial timeout for a failure retry +# @param naviback.clearCacheThreshold Memory usage percentage threshold to run cache cleanup # @param naviback.dump.result Dump results in logs # @param naviback.dump.query Dump queries in logs # @param naviback.dump.answer Dump answers in logs @@ -173,6 +176,8 @@ image: # @skip naviback.indices.tugc2gisIndex.enabled # @skip naviback.indices.tugcUsers.enabled # @skip naviback.indices.tugcUsersIndex.enabled +# @skip naviback.indices.routeAsUsual.enabled +# @skip naviback.indices.walkingUserSpeeds.enabled # @extra naviback.additionalSections Optinal JSON block to be added to config file as-is # @skip naviback.simpleNetwork # @extra naviback.simpleNetwork.bicycle Enable simple network for bicycle routing @@ -216,10 +221,12 @@ image: # @param naviback.validation.isochrone.requestSchemaName Name of isochrone request validation schema # @param naviback.validation.isochrone.responseSchemaName Name of isochrone response validation schema # @param naviback.tilesMetricsThreshold The value at which we send tiles metrics (used for internal tests) +# @param naviback.engineUpdatePeriodSec The time interval between engine updates # @param naviback.hierarchies.enabled If SN cache available # @param naviback.hierarchies.skipPatches Skip patches in hierarchies cache, ignored if skipShortcuts set # @param naviback.hierarchies.skipShortcuts Skip shortcuts in SN cache # @param naviback.hierarchies.s3path Hierarchies cache remote location +# @param naviback.hierarchies.volume Hierarchies local cache specification. Leave empty for default emptydir. # @param naviback.etaScheduleIndex.enabled If Schedule Index available # @param naviback.etaScheduleIndex.url Schedule Index remote url # @skip rules @@ -237,6 +244,7 @@ naviback: timeoutIncrementSec: 140 totalRetryDurationSec: 2400 initialRetryIntervalSec: 2 + clearCacheThreshold: 90 dump: result: false query: false @@ -308,6 +316,10 @@ naviback: enabled: false tugcUsersIndex: enabled: false + routeAsUsual: + enabled: false + walkingUserSpeeds: + enabled: false simpleNetwork: emergency: false attractor: {} @@ -345,11 +357,13 @@ naviback: requestSchemaName: IsochroneApiRequestModel.json responseSchemaName: IsochroneApiResponseModel.json tilesMetricsThreshold: 0 + engineUpdatePeriodSec: 30 hierarchies: enabled: false skipPatches: false skipShortcuts: false s3path: '' + volume: {} etaScheduleIndex: enabled: false url: '' @@ -362,6 +376,7 @@ rules: [] # @param envoy.image.repository Repository # @param envoy.image.tag Tag # @param envoy.image.pullPolicy Pull Policy +# @param envoy.concurrency The number of worker threads to run. Use `max(1, floor(resources.limits.cpu))` if set to `0` # @param envoy.resources [nullable] Container resources requirements structure # @param envoy.resources.requests.cpu [nullable] CPU request, recommended value `100m` # @param envoy.resources.requests.memory [nullable] Memory request, recommended value `100Mi` @@ -373,6 +388,7 @@ envoy: repository: 2gis-on-premise/envoy pullPolicy: IfNotPresent tag: v1.27.0 + concurrency: '' resources: {} diff --git a/charts/navi-castle/Chart.yaml b/charts/navi-castle/Chart.yaml index 0080cae33..19e25bca2 100644 --- a/charts/navi-castle/Chart.yaml +++ b/charts/navi-castle/Chart.yaml @@ -4,7 +4,7 @@ description: Castle Helm chart for Kubernetes type: application -version: 1.30.0 +version: 1.31.0 appVersion: 1.9.2 maintainers: diff --git a/charts/navi-castle/templates/cronjob.yaml b/charts/navi-castle/templates/cronjob.yaml index 87dde3969..a12ee3f5d 100644 --- a/charts/navi-castle/templates/cronjob.yaml +++ b/charts/navi-castle/templates/cronjob.yaml @@ -38,7 +38,7 @@ spec: - name: {{ include "castle.fullname" $ }}-builder-config configMap: name: {{ include "castle.fullname" $ }}-builder-config - {{- if .Values.customCAs.bundle }} + {{- if $.Values.customCAs.bundle }} - name: {{ include "castle.fullname" $ }}-ca configMap: name: {{ include "castle.fullname" $ }}-ca @@ -53,7 +53,7 @@ spec: - /opt/config_builder.conf - --service={{ include "castle.serviceParameter" ( dict "flavor" $flavor ) }} - --jobs={{ $.Values.castle.jobs | default 1 | int }} - {{- if .Values.customCAs.bundle }} + {{- if $.Values.customCAs.bundle }} env: - name: SSL_CERT_FILE value: {{ include "custom.ca.mountPath" . }}/custom-ca.crt @@ -65,7 +65,7 @@ spec: - name: {{ include "castle.fullname" $ }}-builder-config mountPath: {{ $.Values.castle.castleDataPath }}/cities_template subPath: cities_template - {{- if .Values.customCAs.bundle }} + {{- if $.Values.customCAs.bundle }} - name: {{ include "castle.fullname" $ }}-ca mountPath: {{ include "custom.ca.mountPath" . }}/custom-ca.crt subPath: custom-ca.crt diff --git a/charts/navi-front/Chart.yaml b/charts/navi-front/Chart.yaml index f69750652..6f6037f86 100644 --- a/charts/navi-front/Chart.yaml +++ b/charts/navi-front/Chart.yaml @@ -5,7 +5,7 @@ type: application keywords: - navi - front -version: 1.30.0 +version: 1.31.0 appVersion: 1.24.1 maintainers: - name: 2gis diff --git a/charts/navi-restrictions/Chart.yaml b/charts/navi-restrictions/Chart.yaml index 7bd265524..6ccb9e8f8 100644 --- a/charts/navi-restrictions/Chart.yaml +++ b/charts/navi-restrictions/Chart.yaml @@ -4,7 +4,7 @@ description: A Helm chart for Kubernetes to deploy Restrictions backend type: application -version: 1.30.0 +version: 1.31.0 appVersion: 1.24.1 maintainers: diff --git a/charts/navi-router/Chart.yaml b/charts/navi-router/Chart.yaml index 4def4c763..2ebda4625 100644 --- a/charts/navi-router/Chart.yaml +++ b/charts/navi-router/Chart.yaml @@ -5,7 +5,7 @@ type: application keywords: - navi - router -version: 1.30.0 +version: 1.31.0 appVersion: 6.24.0.3 maintainers: - name: 2gis diff --git a/charts/navi-splitter/Chart.yaml b/charts/navi-splitter/Chart.yaml index 2712eff5a..fda13052c 100644 --- a/charts/navi-splitter/Chart.yaml +++ b/charts/navi-splitter/Chart.yaml @@ -15,5 +15,5 @@ maintainers: - name: 2gis url: https://github.com/2gis email: on-premise@2gis.com -version: 1.30.0 +version: 1.31.0 appVersion: 1.0.1 diff --git a/charts/platform/Chart.yaml b/charts/platform/Chart.yaml index 5fb4fb9c0..3758bed61 100644 --- a/charts/platform/Chart.yaml +++ b/charts/platform/Chart.yaml @@ -3,7 +3,7 @@ name: platform type: application description: A Helm chart for Kubernetes to deploy Platform -version: 1.30.0 +version: 1.31.0 appVersion: 0.15.1 maintainers: diff --git a/charts/pro-api/Chart.yaml b/charts/pro-api/Chart.yaml index 9cb7b13b3..bc2118c43 100644 --- a/charts/pro-api/Chart.yaml +++ b/charts/pro-api/Chart.yaml @@ -4,7 +4,7 @@ description: Geo API for getting geo data type: application -version: 1.30.0 +version: 1.31.0 appVersion: 1.41.0 maintainers: diff --git a/charts/pro-ui/Chart.yaml b/charts/pro-ui/Chart.yaml index ab3ce3214..d3c1b4ad0 100644 --- a/charts/pro-ui/Chart.yaml +++ b/charts/pro-ui/Chart.yaml @@ -3,7 +3,7 @@ name: pro-ui type: application description: A Helm chart for Kubernetes to deploy 2GIS Pro UI service -version: 1.30.0 +version: 1.31.0 appVersion: 2.27.0 maintainers: diff --git a/charts/search-api/Chart.yaml b/charts/search-api/Chart.yaml index bdab4ab85..34c5b4851 100644 --- a/charts/search-api/Chart.yaml +++ b/charts/search-api/Chart.yaml @@ -4,8 +4,8 @@ description: Search engine for catalog type: application -version: 1.30.0 -appVersion: 7.80.0 +version: 1.31.0 +appVersion: 7.85.0 maintainers: - name: 2gis diff --git a/charts/search-api/README.md b/charts/search-api/README.md index ce762895f..1c91dab14 100644 --- a/charts/search-api/README.md +++ b/charts/search-api/README.md @@ -56,7 +56,7 @@ See the [documentation](https://docs.2gis.com/en/on-premise/search) to learn abo | Name | Description | Value | | ---------------------- | --------------------------------------------------------------------------------------------- | ---------------------------- | | `api.image.repository` | Repository | `2gis-on-premise/search-api` | -| `api.image.tag` | Tag | `7.80.0` | +| `api.image.tag` | Tag | `7.85.0` | | `api.image.pullPolicy` | Image [pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) | `IfNotPresent` | ### API settings diff --git a/charts/search-api/values.yaml b/charts/search-api/values.yaml index d51e8cb6c..dfade718f 100644 --- a/charts/search-api/values.yaml +++ b/charts/search-api/values.yaml @@ -56,7 +56,7 @@ api: image: repository: 2gis-on-premise/search-api - tag: 7.80.0 + tag: 7.85.0 pullPolicy: IfNotPresent diff --git a/charts/stat-receiver/Chart.yaml b/charts/stat-receiver/Chart.yaml index 4d242a98a..041e31f74 100644 --- a/charts/stat-receiver/Chart.yaml +++ b/charts/stat-receiver/Chart.yaml @@ -3,7 +3,7 @@ name: stat-receiver type: application description: A Helm chart for Kubernetes to deploy Stat Receiver -version: 1.30.0 +version: 1.31.0 appVersion: 1.11.1 maintainers: diff --git a/charts/styles-api/Chart.yaml b/charts/styles-api/Chart.yaml index 401bee3d5..a707e9b59 100644 --- a/charts/styles-api/Chart.yaml +++ b/charts/styles-api/Chart.yaml @@ -3,7 +3,7 @@ name: styles-api type: application description: A Helm chart for Kubernetes to deploy API Styles service -version: 1.30.0 +version: 1.31.0 appVersion: 0.30.0 maintainers: diff --git a/charts/tiles-api/Chart.yaml b/charts/tiles-api/Chart.yaml index a0b0e0875..22f21aa5a 100644 --- a/charts/tiles-api/Chart.yaml +++ b/charts/tiles-api/Chart.yaml @@ -4,7 +4,7 @@ description: Tiles API for getting cartographic data type: application -version: 1.30.0 +version: 1.31.0 appVersion: 4.61.0 maintainers: diff --git a/charts/traffic-proxy/Chart.yaml b/charts/traffic-proxy/Chart.yaml index 5035695f1..e80f576a2 100644 --- a/charts/traffic-proxy/Chart.yaml +++ b/charts/traffic-proxy/Chart.yaml @@ -4,7 +4,7 @@ description: A Helm chart for Kubernetes to deploy Proxy for traffic jams type: application -version: 1.30.0 +version: 1.31.0 appVersion: 1.21.6 maintainers: diff --git a/charts/twins-api/Chart.yaml b/charts/twins-api/Chart.yaml index caf15e205..3eb589bc9 100644 --- a/charts/twins-api/Chart.yaml +++ b/charts/twins-api/Chart.yaml @@ -3,7 +3,7 @@ name: twins-api type: application description: A Helm chart for Kubernetes to deploy API Twins service -version: 1.30.0 +version: 1.31.0 appVersion: 1.13.0 maintainers: diff --git a/charts/twins-api/README.md b/charts/twins-api/README.md index d8c3efda9..a226167d2 100644 --- a/charts/twins-api/README.md +++ b/charts/twins-api/README.md @@ -25,13 +25,16 @@ Use this Helm chart to deploy API Twins service, which is a part of 2GIS's [On-P ### Deployment Artifacts Storage settings -| Name | Description | Value | -| ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----- | -| `dgctlStorage.host` | S3 host. Format: `host:port`. **Required** | `""` | -| `dgctlStorage.bucket` | S3 bucket name. **Required** | `""` | -| `dgctlStorage.accessKey` | S3 access key for accessing the bucket. **Required** | `""` | -| `dgctlStorage.secretKey` | S3 secret key for accessing the bucket. **Required** | `""` | -| `dgctlStorage.manifest` | The path to the [manifest file](https://docs.2gis.com/en/on-premise/overview#nav-lvl2@paramCommon_deployment_steps). Format: `manifests/0000000000.json`
This file contains the description of pieces of data that the service requires to operate. **Required** | `""` | +| Name | Description | Value | +| ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | +| `dgctlStorage.host` | S3 host. Format: `host:port`. **Required** | `""` | +| `dgctlStorage.region` | S3 region name. | `""` | +| `dgctlStorage.secure` | Set to `true` if dgctlStorage.host must be accessed via https. **Required** | `false` | +| `dgctlStorage.verifySsl` | Set to `false` if dgctlStorage.host must be accessed via https without certificate validation. **Required** | `true` | +| `dgctlStorage.bucket` | S3 bucket name. **Required** | `""` | +| `dgctlStorage.accessKey` | S3 access key for accessing the bucket. **Required** | `""` | +| `dgctlStorage.secretKey` | S3 secret key for accessing the bucket. **Required** | `""` | +| `dgctlStorage.manifest` | The path to the [manifest file](https://docs.2gis.com/en/on-premise/overview#nav-lvl2@paramCommon_deployment_steps). Format: `manifests/0000000000.json`
This file contains the description of pieces of data that the service requires to operate. **Required** | `""` | ### API service settings diff --git a/charts/twins-api/templates/_helpers.tpl b/charts/twins-api/templates/_helpers.tpl index 42c6fabaa..be6ce1950 100644 --- a/charts/twins-api/templates/_helpers.tpl +++ b/charts/twins-api/templates/_helpers.tpl @@ -153,6 +153,12 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} value: "{{ .Values.importer.postgres.schemaSwitchEnabled }}" - name: TWINS_S3_ENDPOINT value: "{{ .Values.dgctlStorage.host }}" +- name: TWINS_S3_REGION + value: "{{ .Values.dgctlStorage.region }}" +- name: TWINS_S3_SECURE + value: "{{ .Values.dgctlStorage.secure }}" +- name: TWINS_S3_VERIFY_SSL + value: "{{ .Values.dgctlStorage.verifySsl }}" - name: TWINS_S3_BUCKET value: "{{ .Values.dgctlStorage.bucket }}" - name: TWINS_S3_ACCESS_KEY diff --git a/charts/twins-api/values.yaml b/charts/twins-api/values.yaml index be79dd650..7a06d6fb1 100644 --- a/charts/twins-api/values.yaml +++ b/charts/twins-api/values.yaml @@ -17,6 +17,9 @@ imagePullSecrets: [] # @section Deployment Artifacts Storage settings # @param dgctlStorage.host S3 host. Format: `host:port`. **Required** +# @param dgctlStorage.region S3 region name. +# @param dgctlStorage.secure Set to `true` if dgctlStorage.host must be accessed via https. **Required** +# @param dgctlStorage.verifySsl Set to `false` if dgctlStorage.host must be accessed via https without certificate validation. **Required** # @param dgctlStorage.bucket S3 bucket name. **Required** # @param dgctlStorage.accessKey S3 access key for accessing the bucket. **Required** # @param dgctlStorage.secretKey S3 secret key for accessing the bucket. **Required** @@ -24,6 +27,9 @@ imagePullSecrets: [] dgctlStorage: host: '' + region: '' + secure: false + verifySsl: true bucket: '' accessKey: '' secretKey: '' diff --git a/image_versions.txt b/image_versions.txt index 1d7d37b3c..db6ea741b 100644 --- a/image_versions.txt +++ b/image_versions.txt @@ -9,8 +9,8 @@ citylens dgtt dgtt:0.2.27-b188673e09 floors-api - floors-importer:1.0.4 - floors-nodejs:1.0.4 + floors-importer:1.1.0 + floors-nodejs:1.1.0 nginx:1.21.6 generic-chart gis-platform @@ -28,7 +28,7 @@ keys license license:2.2.3 mapgl-js-api - mapgl:1.51.0 + mapgl:1.53.0 navi-async-grpc-proxy async-grpc-proxy:1.0.0 navi-async-matrix @@ -36,7 +36,7 @@ navi-async-matrix navi-back envoy:v1.27.0 metrics-aggregator: - navi-back:7.27.1.2 + navi-back:7.29.2.2 navi-castle navi-castle:1.9.2 navi-front:1.24.1 @@ -60,7 +60,7 @@ pro-ui pro-importer:1.41.0 pro-ui:2.27.0 search-api - search-api:7.80.0 + search-api:7.85.0 search-nginx:1.21.6 stat-receiver stat-receiver-api:1.11.1