Skip to content

Commit 5fb603e

Browse files
mprudnikov3AshigoFreakyGrannyPeterBeklemishevi-bogomazov
authored
Release 1.31.0 (#533)
* fix pro-api/values.yaml doc (#432) * [tiles-api] Upgrade to 4.54.0 (#428) * Add missing default for enabled_modules->predictors in citylens-web configmap (#433) * navi-router 6.17.0.8 -> 6.17.1.2 (#434) * [PRO-5009] Changed helm/hooks. (#436) * pro-ui: New external style manager config (#426) * pro-ui: New external style manager config * GH Actions readme checker workflow (#438) * base wf * fix * update * update * update * update * update * update * clean * clean * minor documentation changes --------- Co-authored-by: Dmitrii Moskalev <[email protected]> * Gh actions readme checker changing name (#440) * base wf * fix * update * update * update * update * update * update * clean * clean * minor documentation changes * changing name --------- Co-authored-by: Dmitrii Moskalev <[email protected]> * PRO-UI 2.14.0 (#441) * PRO-UI fix hooks (#443) * [PRO-5181] Обновление pro-api до версии 1.22.0 и pro-ui до версии 2.15.1 (#435) * [PRO-5181] Обновление pro-api до версии 1.17 * [PRO-5181] Поправлены замечания по ревью * [PRO-5181] Поправлен url для catalog * [PRO-5181] обновил образ до 1.22.0 * [PRO-5181] Обновление pro-api до версии 1.17 * [PRO-5181] Поправлены замечания по ревью * [PRO-5181] Поправлен url для catalog * [PRO-5181] обновил образ до 1.22.0 * Add new version for PRO-UI * Fix readme * Citylens 1.9.0 & custom CA support (#439) * Added custom CA support * Update version to 1.9.0 * Fix customCA documentation * Update readme * Fix broken templating * Fix citylens-web configmap (#448) * Gis-platform. Мелкие правки по дефолтным параметрам (#450) * [license] Fixed issue with k8s ca automount (#444) * WAPI-23444 custom ca twins api (#437) * WAPI-23444 custom ca twins api * WAPI-23444 custom ca twins api * WAPI-23444 custom ca twins api * Bump citylens to 1.10.0 (#453) * Bump citylens to 1.10.0 * Complete renaming pro.url to pro.baseUrl * PRO-5559: upgrade key ui to latest (#449) * PRO-5559: upgrade key ui to latest * WAPI-23482 Add configuration for Public API sign (#429) * WAPI-23482 Add configuration for Public API sign * impr * disabled by default * optional signkey in secret * optional signkey in secret * upd image version * reset chart version --------- Co-authored-by: Kirill Salnikov <[email protected]> * Правки в чартах mapgl-js-api и floors-api (#420) * Add ability to add extra env vars to citylens-web deployment (#455) * Add ability to add extra env vars to citylens-web deployment * Fix missing end tag * chart/generic-chart syncup (#452) * pro-api serviceAccountOverride support (#456) * changes * update * value description added * readme update * readme update --------- Co-authored-by: Dmitrii Moskalev <[email protected]> * [chart/navi-back] 7.23.0.5 release (#451) * fix conflict * [ONPREM-839] Add revisionHistoryLimit (#459) * add revisionHistoryLimit spec for catalog-api * add revisionHistoryLimit for citylens * add revisionHistoryLimit for dgtt * add revisionHistoryLimit for floors-api * add revisionHistoryLimit to gis-platform * add revisionHistoryLimit to keycloak * add revisionHistoryLimit to kays * add revisionHistoryLimit to license * add revisionHistoryLimit to mapgl * add revisionHistoryLimit to platform * add revisionHistoryLimit to search-api * add revisionHistoryLimit to stat-reciever * add revisionHistoryLimit to traffic-proxy * Add revisionHistoryLimit to twins-api * update readme files * fix schema and value path * fix license lint error * remove revisionHistoryLimit for StatefulSet * add revision history limit to navi-services (#458) * add revisionHistoryLimit to navi-async-matrix * add revisionHistoryLimit to navi-castle * add revisionHistoryLimit to navi-front * add revisionHistoryLimit to navi-restrictions * add revisionHistoryLimit to navi-router * update readme files for navi * update default value to 3 * remove revisionHistoryLimit for StatefulSet * Add github action with Mattermost Notify (#465) * [DEVOPS-1178] add navi back freeroam (#447) * [tiles-api] Upgrade to 4.54.0 (#428) * PRO-UI 2.14.0 (#441) * [DEVOPS-1178] add navi back freeroam * [DEVOPS-1178] up versions and add rules for free roam * [DEVOPS-1178] typo * [DEVOPS-1178] add gzip --------- Co-authored-by: FreakyGranny <[email protected]> Co-authored-by: Aveldin1 <[email protected]> Co-authored-by: Сентябов Александр Сергеевич <[email protected]> * [PRO-5488] Change-Helm for PRO-UI (#460) * Change-Helm for PRO-UI * Fix Readme * add link to docs.2gis.com --------- Co-authored-by: Igor Sheykin <[email protected]> * Add new citylens-workers based worker & add Drivers asset-related topics (#466) * Update Chart.yaml * changelog update * conflict trash fix * update * Chore: remove unused helmfile (#480) * search-api: custom CA certificates support (#478) * Проверить ПР search 478. Fix readme (#485) * Обновление PRO API до версии 1.35.0 и PRO UI до версии 2.27.0 (#481) * Citylens 1.12.0 (#484) * Update Citylens 1.12.0 --------- Co-authored-by: Petr Beklemishev <[email protected]> * chart/navi-back syncup (#470) * Chore: styleguide kafka example (#488) * WAPI-23606 catalog search config (#475) * DEVOPS-1348: add bicycle nginx location to navi-front (#487) * Platform 0.15.0 (#483) * GEFEST-82: update platform to 0-15-0 * GEFEST-82: update pages comment --------- Co-authored-by: Milov Dmitriy <[email protected]> * TILES-6466 mapgl-js-api: add styles server vars (#469) * mapgl-js-api: add styles server vars * Apply suggestions from code review Co-authored-by: Michel Beloshitsky <[email protected]> * Link readme * Use mapgl-api 1.50.0 * Update mapgl --------- Co-authored-by: Нищета Дмитрий Антонович <[email protected]> Co-authored-by: Michel Beloshitsky <[email protected]> Co-authored-by: Igor Sheykin <[email protected]> * WAPI-23337 Интеграция catalog api с сервисом license v2 (#486) * fix pro-ui values * [navi-async-matrix] netloc must start with scheme (#477) * [chart/navi-back] chart syncup (#493) * Upgrade version of platform UI to 0.15.1 (#491) * Mapgl styles default urls fix (#494) * style urls fix * update default values and description * update readme * defined mapgl_demo_key * [keys-api] empty default values (#499) * WAPI-23578 Styles API (#482) * WAPI-23578 Styles API * WAPI-23578 Remove configurable s3 bucket for styles * Revert "WAPI-23578 Remove configurable s3 bucket for styles" This reverts commit f7f3e6f. * Styles API version as 1.0.0 * Add missiong secrets deploy annotations * Increase ingress default body size, remove useless worker disable * Fix ingress values annotations * Disable ingress nginx params * Use secret in jobs deploy * Worker as deployment * Set default nginx ingress body size * Set actual Styles API release version * Fix notes Twins mension * fix initialDelaySeconds for worker * No useless peristent volume * rename endpoint to host, update descriptions * fix required * fix readme --------- Co-authored-by: Gopanenko Pavel <[email protected]> Co-authored-by: Igor Sheykin <[email protected]> * [DEVOPS-1394] fix typo in castle chart (#501) * Release 1.28.2 (#505) (#507) * Change variables naming (#506) * [stat-receiver] Change variables naming --------- Co-authored-by: Sergey Vlasov <[email protected]> * add required field to mapgl ENV values (#504) * Citylens 1.13.0 (#508) * DEVOPS-1409: add securityContext (#510) * [license] Upgraded app version to 2.2.3 (#496) * [license] Upgraded app version to 2.2.2 * [license] Upgraded app version to 2.2.3 and added dgctlStorage.region, persistence.region to values * Изменение структуры чарта pro-api (#490) * Improve MapGL JS API params (#509) * [chart/navi-back] chart syncup (#498) * Added custom CA support --------- Co-authored-by: Morozov Dmitriy <[email protected]> * add custom ca for navi-castle, navi-restrictions, navi-async-matrix (#511) Co-authored-by: Morozov Dmitriy <[email protected]> * sm fix * Fix customCAs include in navi-castle cronjob template * Revert "Fix customCAs include in navi-castle cronjob template" This reverts commit 9db512e. * Add github action "MM Release notification" (#516) * [ONPREM-932] test notif release mm * [ONPREM-932] change tests rules * [ONPREM-932] add changes job rules * [ONPREM-932] fix on.workflows * [ONPREM-932] fixes style * [ONPREM-932] rename PR notif action & fix release notif --------- Co-authored-by: mprudnikov3 <[email protected]> * [gis-platform] Do not use config template (#512) * [EVERGIS] websocket-services должен указывать на backend.service.name. Required defaults (#457) * [EVERGIS] websocket-services должен указывать на backend.service.name * [EVERGIS] websocket-services должен указывать на backend.service.name. Default values * [EVERGIS] websocket-services должен указывать на backend.service.name. Default values --------- Co-authored-by: Alexander Voronkov <[email protected]> * [traffic-proxy] Update traffic-proxy chart configuration and nginx template (#518) * Update traffic-proxy chart configuration and nginx template * Add customizable server section * Update charts/traffic-proxy/templates/configmap.yaml Co-authored-by: Voronkov Alexander <[email protected]> * Update charts/traffic-proxy/templates/configmap.yaml Co-authored-by: Voronkov Alexander <[email protected]> * Change log configuration * Change README * lint fix * Delete duplicate field description in traffic-proxy * Fix configmap spaces. Add loglevel field allowed values --------- Co-authored-by: Sergey Vlasov <[email protected]> Co-authored-by: Voronkov Alexander <[email protected]> * Upgrade to 4.61.0 (#514) Co-authored-by: p.fomin <[email protected]> Co-authored-by: mprudnikov3 <[email protected]> * [PRO-6241] Обновление PRO API до версии 1.41.1 (#513) * [GEFEST-877] Dispatcher deployment and cleaner cronjob (#446) * Chore: Update styleguide for logging block (#521) * Citylens 1.14.0 (#523) * Release 1.30.0 (#525) Co-authored-by: mprudnikov <[email protected]> * Release 1.30.0 (#526) (#527) * Fix lint warning for accessLog value (#529) * TILES-6894 floors-api: add user certs (#524) * floors-api: add user certs * Format --------- Co-authored-by: Нищета Дмитрий Антонович <[email protected]> * Bump mapgl-js-api (#530) * Fix release MM notification (#528) * Fix customCAs include in navi-castle cronjob template (#517) * WAPI-23658 добавлены недостающие параметры в конфиг dgctlStorage (#503) * WAPI-23658 добавлены недостающие параметры в конфиг dgctlStorage * WAPI-23658 добавлены недостающие параметры в конфиг dgctlStorage * WAPI-23658 добавлены недостающие параметры в конфиг dgctlStorage * WAPI-23658 добавлены недостающие параметры в конфиг dgctlStorage --------- Co-authored-by: Donov Dmitriy <[email protected]> * chart/navi-back syncup (#531) * release 1.31.0 --------- Co-authored-by: Igor Sheykin <[email protected]> Co-authored-by: FreakyGranny <[email protected]> Co-authored-by: Петр Беклемишев <[email protected]> Co-authored-by: i-bogomazov <[email protected]> Co-authored-by: Andrew Mikhailov <[email protected]> Co-authored-by: Konstantin Lobov <[email protected]> Co-authored-by: DAMoskalev <[email protected]> Co-authored-by: Dmitrii Moskalev <[email protected]> Co-authored-by: Aveldin1 <[email protected]> Co-authored-by: Денис Беляев <[email protected]> Co-authored-by: Denis Belyaev <[email protected]> Co-authored-by: v-loboda <[email protected]> Co-authored-by: Sergey Ordin <[email protected]> Co-authored-by: Voronkov Alexander <[email protected]> Co-authored-by: Vladimir Popov <[email protected]> Co-authored-by: Dmitriy Donov <[email protected]> Co-authored-by: ostrovskiy2gis <[email protected]> Co-authored-by: Kirill Salnikov <[email protected]> Co-authored-by: Michel Beloshitsky <[email protected]> Co-authored-by: Полозов Игорь Сергеевич <[email protected]> Co-authored-by: uk-navi-ci <[email protected]> Co-authored-by: Sergey Vlasov <[email protected]> Co-authored-by: Alexandr Sentyabov <[email protected]> Co-authored-by: Сентябов Александр Сергеевич <[email protected]> Co-authored-by: Igor Sheykin <[email protected]> Co-authored-by: Andrey Morozov <[email protected]> Co-authored-by: zhukov-d-man <[email protected]> Co-authored-by: Dmitrii Molochnikov <[email protected]> Co-authored-by: Petr Beklemishev <[email protected]> Co-authored-by: Morozov Dmitriy <[email protected]> Co-authored-by: Dmitry Milov <[email protected]> Co-authored-by: Milov Dmitriy <[email protected]> Co-authored-by: Dmitry Nischeta <[email protected]> Co-authored-by: Нищета Дмитрий Антонович <[email protected]> Co-authored-by: vgivanov <[email protected]> Co-authored-by: Pavel Gopanenko <[email protected]> Co-authored-by: Gopanenko Pavel <[email protected]> Co-authored-by: Sergey Vlasov <[email protected]> Co-authored-by: Morozov Dmitriy <[email protected]> Co-authored-by: mprudnikov3 <[email protected]> Co-authored-by: Alexander Voronkov <[email protected]> Co-authored-by: p.fomin <[email protected]> Co-authored-by: ArtemPolykov <[email protected]> Co-authored-by: urbiae <[email protected]> Co-authored-by: Donov Dmitriy <[email protected]>
1 parent e4aa0c3 commit 5fb603e

File tree

48 files changed

+236
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+236
-70
lines changed

‎.github/workflows/mm-release-notify.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ jobs:
2323
MATTERMOST_USERNAME: Github
2424
MATTERMOST_ICON_URL: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c2/GitHub_Invertocat_Logo.svg/256px-GitHub_Invertocat_Logo.svg.png
2525
TEXT: |
26-
Опубликован On-Premise: ${{ github.ref_name }}
27-
Документация: https://confluence.2gis.ru/display/Karta/Release+${{ github.ref_name }}+On-Premise
26+
Опубликован On-Premise: ${{ github.event.workflow_run.head_branch }}
27+
Документация: https://confluence.2gis.ru/display/ONPREM/Release+${{ github.event.workflow_run.head_branch }}+On-Premise

‎CHANGELOG.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
# 2GIS On-Premise Changelog
22

3+
## [1.31.0] (2024-11-07)
4+
#### Images
5+
```
6+
floors-api
7+
- floors-importer:1.0.4
8+
+ floors-importer:1.1.0
9+
- floors-nodejs:1.0.4
10+
+ floors-nodejs:1.1.0
11+
mapgl-js-api
12+
- mapgl:1.51.0
13+
+ mapgl:1.53.0
14+
navi-back
15+
- navi-back:7.27.1.2
16+
+ navi-back:7.29.2.2
17+
search-api
18+
- search-api:7.80.0
19+
+ search-api:7.85.0
20+
21+
```
22+
323
## [1.30.0] (2024-10-24)
424
#### [Breaking-Changes](Breaking-Changes.md#1300)
525
#### Images

‎charts/catalog-api/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: catalog-api
33
type: application
44
description: A Helm chart for Kubernetes to deploy Catalog APIs
55

6-
version: 1.30.0
6+
version: 1.31.0
77
appVersion: 3.625.0
88

99
maintainers:

‎charts/citylens/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: citylens
33
type: application
44
description: A Helm chart for Kubernetes to deploy Citylens service
55

6-
version: 1.30.0
6+
version: 1.31.0
77
appVersion: 1.14.2
88

99
maintainers:

‎charts/dgtt/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: dgtt
33
description: DGTT Helm chart for Kubernetes
44
type: application
55

6-
version: 1.30.0
6+
version: 1.31.0
77
appVersion: 0.2.27-b188673e09
88

99
maintainers:

‎charts/floors-api/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: floors-api
33
description: Helm for floors service
44
type: application
55

6-
version: 1.30.0
7-
appVersion: 1.0.4
6+
version: 1.31.0
7+
appVersion: 1.1.0
88

99
maintainers:
1010
- name: 2gis

‎charts/floors-api/README.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Read more about the On-Premise solution [here](https://docs.2gis.com/en/on-premi
1818
| ------------------------- | -------------------------------- | ------------------------------- |
1919
| `nodejs.image.repository` | Floors backend image repository. | `2gis-on-premise/floors-nodejs` |
2020
| `nodejs.image.pullPolicy` | Floors backend pull policy. | `IfNotPresent` |
21-
| `nodejs.image.tag` | Floors backend image tag. | `1.0.4` |
21+
| `nodejs.image.tag` | Floors backend image tag. | `1.1.0` |
2222
| `nginx.image.repository` | Floors nginx image repository. | `2gis-on-premise/nginx` |
2323
| `nginx.image.pullPolicy` | Floors nginx pull policy. | `IfNotPresent` |
2424
| `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
102102
| Name | Description | Value |
103103
| ---------------------------------- | -------------------------------- | --------------------------------- |
104104
| `import.image.repository` | Import task image repository. | `2gis-on-premise/floors-importer` |
105-
| `import.image.tag` | Import task image tag. | `1.0.4` |
105+
| `import.image.tag` | Import task image tag. | `1.1.0` |
106106
| `import.image.pullPolicy` | Import task pull policy. | `IfNotPresent` |
107107
| `import.resources.requests.cpu` | A CPU request, e.g., `100m`. | |
108108
| `import.resources.requests.memory` | A memory request, e.g., `128Mi`. | |
109109
| `import.resources.limits.cpu` | A CPU limit, e.g., `100m`. | |
110110
| `import.resources.limits.memory` | A memory limit, e.g., `128Mi`. | |
111+
112+
### **Custom Certificate Authority**
113+
114+
| Name | Description | Value |
115+
| --------------------- | --------------------------------------------------------------------------------------------------------------------------- | ----- |
116+
| `customCAs.bundle` | Custom CA [text representation of the X.509 PEM public-key certificate](https://www.rfc-editor.org/rfc/rfc7468#section-5.1) | `""` |
117+
| `customCAs.certsPath` | Custom CA bundle mount directory in the container. | `""` |

‎charts/floors-api/templates/_helpers.tpl‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,14 @@ Return the appropriate apiVersion for Horizontal Pod Autoscaler.
6767
{{- print "autoscaling/v2" -}}
6868
{{- end -}}
6969
{{- end -}}
70+
71+
{{/*
72+
Mount directory for custom CA
73+
*/}}
74+
{{- define "floors.customCA.mountPath" -}}
75+
{{ $.Values.customCAs.certsPath | default "/usr/local/share/ca-certificates" }}
76+
{{- end -}}
77+
78+
{{- define "floors.checksum" -}}
79+
{{ (include (print $.Template.BasePath .path) $ | fromYaml).data | toYaml | sha256sum }}
80+
{{- end }}

‎charts/floors-api/templates/custom-ca.configmap.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{{- if $.Values.customCAs.bundle }}
2+
---
3+
apiVersion: v1
4+
kind: ConfigMap
5+
metadata:
6+
name: {{ include "floors.fullname" . }}-custom-ca
7+
labels:
8+
{{- include "floors.labels" . | nindent 4 }}
9+
10+
data:
11+
custom-ca.crt: |-
12+
{{- $.Values.customCAs.bundle | nindent 4 }}
13+
{{- end }}

‎charts/floors-api/templates/deployment.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ spec:
2727
metadata:
2828
{{- with .Values.podAnnotations }}
2929
annotations:
30+
checksum/custom-ca: {{ include "floors.checksum" (merge (dict "path" "/custom-ca.configmap.yaml") $) }}
3031
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
3132
{{- toYaml . | nindent 8 }}
3233
{{- end }}
@@ -60,9 +61,19 @@ spec:
6061
value: "{{ .Values.dgctlStorage.region }}"
6162
- name: IMPORTER_S3_SECURE
6263
value: "{{ .Values.dgctlStorage.secure }}"
64+
{{- if $.Values.customCAs.bundle }}
65+
- name: IMPORTER_SSL_CERT_FILE
66+
value: {{ include "floors.customCA.mountPath" $ }}/custom-ca.crt
67+
{{- end }}
6368
volumeMounts:
6469
- name: {{ include "floors.fullname" $ }}-data
6570
mountPath: "/var/floorsConvertedData"
71+
{{- if $.Values.customCAs.bundle }}
72+
- name: custom-ca
73+
mountPath: {{ include "floors.customCA.mountPath" $ }}/custom-ca.crt
74+
subPath: custom-ca.crt
75+
readOnly: true
76+
{{- end }}
6677
resources:
6778
{{- toYaml .Values.resources | nindent 12 }}
6879
containers:
@@ -146,6 +157,11 @@ spec:
146157
path: servers.conf
147158
- name: {{ include "floors.fullname" $ }}-data
148159
emptyDir: {}
160+
{{- if $.Values.customCAs.bundle }}
161+
- name: custom-ca
162+
configMap:
163+
name: {{ include "floors.fullname" $ }}-custom-ca
164+
{{- end }}
149165
{{- with .Values.imagePullSecrets }}
150166
imagePullSecrets:
151167
{{- toYaml . | nindent 8 }}

0 commit comments

Comments
 (0)