Skip to content

[PRO-9224] Новая версия pro-api #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 9, 2025
Merged

[PRO-9224] Новая версия pro-api #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Breaking-Changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# 2GIS On-Premise Breaking-Changes

## [NEWVERSION]

### pro-api
- `kafka.eventsTopic.readerGroupId` is now required for tasks-worker deployment
- `keys` service is completely removed from values

## [1.43.0]

### navi-attractor
Expand Down
2 changes: 1 addition & 1 deletion charts/pro-api/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Geo API for getting geo data
type: application

version: 2.0.0
appVersion: 2.26.0
appVersion: 2.31.1

maintainers:
- name: 2gis
Expand Down
17 changes: 5 additions & 12 deletions charts/pro-api/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
| ----------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------- |
| `api.appName` | Name of the service | `pro-api` |
| `api.image.repository` | Repository | `2gis-on-premise/pro-api` |
| `api.image.tag` | Tag | `2.26.0` |
| `api.image.tag` | Tag | `2.31.1` |
| `api.image.pullPolicy` | Pull Policy | `IfNotPresent` |
| `api.ingress.enabled` | If Ingress is enabled for the service. | `false` |
| `api.ingress.className` | Name of the Ingress controller class. | `nginx` |
Expand Down Expand Up @@ -77,7 +77,7 @@
| Name | Description | Value |
| ------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------- |
| `permissions.image.repository` | Repository | `2gis-on-premise/pro-permissions-api` |
| `permissions.image.tag` | Tag | `2.26.0` |
| `permissions.image.tag` | Tag | `2.31.1` |
| `permissions.image.pullPolicy` | Pull Policy | `IfNotPresent` |
| `permissions.ingress.enabled` | If Ingress is enabled for the service | `false` |
| `permissions.ingress.className` | Name of the Ingress controller class | `nginx` |
Expand Down Expand Up @@ -129,7 +129,7 @@
| Name | Description | Value |
| ---------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------- |
| `tasks.image.repository` | Repository | `2gis-on-premise/pro-tasks-api` |
| `tasks.image.tag` | Tag | `2.26.0` |
| `tasks.image.tag` | Tag | `2.31.1` |
| `tasks.image.pullPolicy` | Pull Policy | `IfNotPresent` |
| `tasks.ingress.enabled` | If Ingress is enabled for the service | `false` |
| `tasks.ingress.className` | Name of the Ingress controller class | `nginx` |
Expand Down Expand Up @@ -179,7 +179,7 @@
| `tasks.settings.worker.resourceIntensiveTasksWorkersCount` | Number of threads that will be used by Hangfire-server to performs resource-intensive tasks | `5` |
| `tasks.settings.worker.regularTasksWorkersCount` | Number of threads that will be used by Hangfire-server to performs other tasks | `5` |
| `tasks.settings.worker.longRunningTasksWorkersCount` | Number of threads that will be used by Hangfire-server to performs long tasks | `1` |
| `tasks.settings.features.auditLogging.enabled` | Enable audit log feature | `false` |
| `tasks.settings.features.auditLogging.enabled` | Enable audit log feature | `true` |
| `tasks.settings.admin.auth.schema` | Authentication scheme for Tasks Admin UI (Basic, OIDC, Undefined) | `Undefined` |
| `tasks.settings.admin.auth.basic.username` | Username for Basic authentication scheme | `admin` |
| `tasks.settings.admin.auth.basic.password` | Password for Basic authentication scheme | `""` |
Expand All @@ -196,7 +196,7 @@
| -------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ |
| `assetImporter.appName` | Data Import job name. | `asset-importer` |
| `assetImporter.repository` | Docker Repository Image. | `2gis-on-premise/pro-importer` |
| `assetImporter.tag` | Docker image tag. | `2.26.0` |
| `assetImporter.tag` | Docker image tag. | `2.31.1` |
| `assetImporter.imagePullSecrets` | Kubernetes image pull secrets. | `[]` |
| `assetImporter.schedule` | Import job schedule. | `0 18 * * *` |
| `assetImporter.backoffLimit` | The number of [retries](https://kubernetes.io/docs/concepts/workloads/controllers/job/#pod-backoff-failure-policy) before considering a Job as failed. | `2` |
Expand Down Expand Up @@ -342,13 +342,6 @@
### digger settings


### Keys Service settings

| Name | Description | Value |
| ------------ | ---------------------------------------------------------------------------------------- | ----- |
| `keys.url` | API URL of service for managing partners' keys to 2GIS services (keys.api). **Required** | `""` |
| `keys.token` | keys.api access token. **Required** | `""` |

### Catalog API settings

| Name | Description | Value |
Expand Down
10 changes: 4 additions & 6 deletions charts/pro-api/templates/asset-importer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,13 @@ spec:
value: {{ .Values.assetImporter.settings.esMetricsEnabled | quote }}
- name: Common__TtlSecondsAfterFinished
value: {{ .Values.assetImporter.settings.ttlSecondsAfterFinished | quote }}
- name: Digger__Address
- name: Digger__Url
value: {{ .Values.digger.url | quote }}
- name: Digger__UserName
value: {{ .Values.digger.userName | quote }}
{{ if .Values.digger.password }}
- name: Digger__Password
{{ if .Values.digger.authToken }}
- name: Digger__AuthToken
valueFrom:
secretKeyRef:
key: diggerPassword
key: diggerAuthToken
name: {{ include "pro-api.name" . }}-secret
{{ end }}
- name: Navi__Url
Expand Down
20 changes: 9 additions & 11 deletions charts/pro-api/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
containerPort: 8080
protocol: TCP
volumeMounts:
- mountPath: "{{ .Values.api.settings.tempPath }}"
- mountPath: {{ .Values.api.settings.tempPath | quote }}
name: temp-volume
livenessProbe:
httpGet:
Expand Down Expand Up @@ -173,6 +173,8 @@ spec:
value: {{ .Values.api.settings.corsOrigins | quote }}
- name: Common__FilterByZoneCodes
value: {{ .Values.api.settings.filterByZoneCodes | quote }}
- name: Common__DataCenterId
value: {{ .Values.api.settings.dataCenterId | quote }}
- name: Postgres__ConnectionString
value: {{ include "pro-api.connectionString" . }}
- name: Postgres__ConnectionStringReadonly
Expand Down Expand Up @@ -295,15 +297,6 @@ spec:
value: {{ .Values.api.settings.auth.skipShareLinksPermissionsCheck | quote }}
- name: License__Key
value: {{ required "A valid .Values.api.settings.licenseKey entry required" $.Values.api.settings.licenseKey }}
- name: KEYS_SERVICE_URL
value: {{ .Values.keys.url | quote }}
{{- if .Values.keys.token }}
- name: KEYS_SERVICE_TOKEN
valueFrom:
secretKeyRef:
key: keysServiceToken
name: {{ include "pro-api.name" . }}-secret
{{- end }}
- name: Redis__Host
value: {{ required "A valid .Values.redis.host entry required" $.Values.redis.host }}
- name: Redis__Port
Expand Down Expand Up @@ -359,5 +352,10 @@ spec:
value: {{ .Values.ecommerce.url | quote }}
- name: SberEcommerceApi__UserName
value: {{ .Values.ecommerce.username | quote }}
{{- if .Values.ecommerce.password }}
- name: SberEcommerceApi__Password
value: {{ .Values.ecommerce.password | quote }}
valueFrom:
secretKeyRef:
key: ecommercePassword
name: {{ include "pro-api.name" . }}-secret
{{- end }}
9 changes: 0 additions & 9 deletions charts/pro-api/templates/permissions-api/permissions-api-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,6 @@ spec:
secretKeyRef:
key: permissionsApiKey
name: {{ include "pro-api.name" . }}-secret
- name: KEYS_SERVICE_URL
value: {{ .Values.keys.url | quote }}
{{- if .Values.keys.token }}
- name: KEYS_SERVICE_TOKEN
valueFrom:
secretKeyRef:
key: keysServiceToken
name: {{ include "pro-api.name" . }}-secret
{{- end }}
- name: Redis__Host
value: {{ required "A valid .Values.redis.host entry required" $.Values.redis.host }}
- name: Redis__Port
Expand Down
10 changes: 5 additions & 5 deletions charts/pro-api/templates/secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,13 @@ data:
{{ end }}
s3AccessKey: {{ required "Valid .Values.dgctlStorage.accessKey required!" .Values.dgctlStorage.accessKey | b64enc }}
s3SecretKey: {{ required "Valid .Values.dgctlStorage.secretKey required!" .Values.dgctlStorage.secretKey | b64enc }}
{{ if .Values.digger.password }}
diggerPassword: {{ .Values.digger.password | b64enc }}
{{ if .Values.digger.authToken }}
diggerAuthToken: {{ .Values.digger.authToken | b64enc }}
{{ end }}
permissionsApiKey: {{ required "Valid .Values.permissions.settings.auth.apiKey required!" .Values.permissions.settings.auth.apiKey | b64enc }}
{{ if .Values.elastic.password }}
esPassword: {{ .Values.elastic.password | b64enc }}
{{ end }}
{{ if .Values.keys.token }}
keysServiceToken: {{ .Values.keys.token | b64enc }}
{{ end }}
{{ if .Values.api.settings.auth.apiKey }}
apiKey: {{ .Values.api.settings.auth.apiKey | b64enc }}
{{ end }}
Expand All @@ -50,3 +47,6 @@ data:
{{ if .Values.tasks.settings.admin.auth.oidc.clientSecret }}
tasksAdminAuthOidcClientSecret: {{ .Values.tasks.settings.admin.auth.oidc.clientSecret | b64enc }}
{{ end }}
{{ if .Values.ecommerce.password }}
ecommercePassword: {{ .Values.ecommerce.password | b64enc }}
{{ end }}
18 changes: 18 additions & 0 deletions charts/pro-api/templates/tasks-api/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ spec:
value: {{ $.Values.tasks.settings.features.emailNotifications.enabled | quote }}
- name: FeatureManagement__UserManagement
value: {{ $.Values.tasks.settings.features.userManagement.enabled | quote }}
- name: FeatureManagement__RemoveExpiredSmbDashboards
value: {{ $.Values.tasks.settings.features.removeExpiredSmbDashboards.enabled | quote }}

- name: Common__Logging__Format
value: {{ .Values.tasks.settings.logging.format | quote }}
Expand All @@ -164,6 +166,8 @@ spec:
{{- end }}
- name: Kafka__EventsTopicSettings__Name
value: {{ required "A valid .Values.kafka.eventsTopic.name entry required" $.Values.kafka.eventsTopic.name }}
- name: Kafka__EventsTopicSettings__ReaderGroupId
value: {{ required "A valid .Values.kafka.eventsTopic.readerGroupId entry required" $.Values.kafka.eventsTopic.readerGroupId }}
- name: Kafka__UseReplicaTopics
value: {{ $.Values.kafka.useReplicaTopics | quote }}
- name: Common__Mode
Expand Down Expand Up @@ -219,4 +223,18 @@ spec:
- name: Admin__Auth__Oidc__RequiredRole
value: {{ .Values.tasks.settings.admin.auth.oidc.requiredRole | quote }}
{{- end }}

- name: Redis__Host
value: {{ required "A valid .Values.redis.host entry required" $.Values.redis.host }}
- name: Redis__Port
value: {{ .Values.redis.port | quote }}
- name: Redis__Username
value: {{ $.Values.redis.username }}
{{- if .Values.redis.password }}
- name: Redis__Password
valueFrom:
secretKeyRef:
key: redisPassword
name: {{ include "pro-api.name" . }}-secret
{{- end }}
{{- end }}
Loading