[PRO-6241] Обновление PRO API до версии 1.41.1

Breaking-Changes.md

@@ -1,5 +1,21 @@
 # 2GIS On-Premise Breaking-Changes
 
+## [1.41.0]
+
+### pro-api
+- settings structure changed, settings are grouped by their services
+- set host pro-api.example.com
+- remove appName from api.pod
+- add section backgroundJobs to api.settings
+- api.settings.enableUserAssetsImporter renamed to api.settings.backgroundJobs.enableUserAssetsImporter
+- api.settings.enableAssetsStreaming renamed to api.settings.backgroundJobs.enableAssetsStreaming
+- remove api.settings.auth.permissionsApiKey
+- add section layerGeneration to api.settings
+- add api.settings.layerGeneration.isochroneLayerMaxPointsCount
+- add permissions.settings.auth.apiKey
+- add assetPreparer.settings.files
+- add kafka.useReplicaTopics
+
 ## [1.29.0]
 
 ### mapgl-js-api

charts/pro-api/Chart.yaml

@@ -5,7 +5,7 @@ description: Geo API for getting geo data
 type: application
 
 version: 1.29.0
-appVersion: 1.35.0
+appVersion: 1.41.0
 
 maintainers:
 - name: 2gis

charts/pro-api/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{- if .Values.api.pod.fullnameOverride -}}
 {{- .Values.api.pod.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
-{{- $name := default .Values.api.pod.appName .Values.api.pod.nameOverride -}}
+{{- $name := default .Values.api.appName .Values.api.pod.nameOverride -}}
 {{- if contains $name .Release.Name -}}
 {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -56,7 +56,7 @@
 {{- end -}}
 
 {{- define "pro-api.chart" -}}
-{{- printf "%s-%s" .Values.api.pod.appName .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" .Values.api.appName .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{- define "pro-api.selectorLabels" -}}

charts/pro-api/templates/deployment.yaml

@@ -112,9 +112,9 @@ spec:
             - name: DEBUG
               value: "{{ .Values.api.settings.debug }}"
             - name: Import__EnableUserAssetsImporter
-              value: "{{ .Values.api.settings.enableUserAssetsImporter }}"
+              value: "{{ .Values.api.settings.backgroundJobs.enableUserAssetsImporter }}"
             - name: Import__EnableAssetsStreaming
-              value: "{{ .Values.api.settings.enableAssetsStreaming }}"
+              value: "{{ .Values.api.settings.backgroundJobs.enableAssetsStreaming }}"
             - name: Import__AssetImporterJobName
               value: {{ include "pro-api.asset-importer-name" . }}
             - name: Import__ExternalLinksProxyUrl
@@ -226,6 +226,8 @@ spec:
               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 }}"
             - name: Auth__Type
               value: "{{ .Values.api.settings.auth.type }}"
             - name: Auth__Url
@@ -247,7 +249,7 @@ spec:
             {{ end }}
             - name: Auth__PermissionsApiUrl
               value: {{ include "pro-api.permissions-url" . }}
-            {{ if .Values.api.settings.auth.permissionsApiKey }}
+            {{ if .Values.permissions.settings.auth.apiKey }}
             - name: Auth__PermissionsApiKey
               valueFrom:
                 secretKeyRef:
@@ -300,6 +302,8 @@ spec:
               value: "{{ .Values.api.settings.localCache.trackStatistics }}"
             - name: LicensingService__BaseUri
               value: {{ required "A valid .Values.license.url entry required" $.Values.license.url }}
+            - name: LayerGeneration__IsochroneLayerMaxPointsCount
+              value: "{{ .Values.api.settings.layerGeneration.isochroneLayerMaxPointsCount }}"
             {{- range $i, $s := .Values.api.settings.openApi.servers }}
             - name: OpenApi__Servers__{{$i}}
               value: "{{ $s }}"

charts/pro-api/templates/permissions-api-deployment.yaml

@@ -130,7 +130,7 @@ spec:
                   name: {{ include "pro-api.name" . }}-secret
             - name: Auth__Type
               value: {{ required "A valid .Values.api.settings.auth.type entry required" $.Values.api.settings.auth.type }}
-            {{ if .Values.api.settings.auth.permissionsApiKey }}
+            {{ if .Values.permissions.settings.auth.apiKey }}
             - name: Auth__PermissionsApiKey
               valueFrom:
                 secretKeyRef:
@@ -186,6 +186,8 @@ spec:
               value: "{{ $.Values.kafka.permissionsTopic.readerGroupId }}"
             - name: Kafka__EventsTopicSettings__Name
               value: {{ required "A valid .Values.kafka.eventsTopic.name entry required" $.Values.kafka.eventsTopic.name }}
+            - name: Kafka__UseReplicaTopics
+              value: "{{ $.Values.kafka.useReplicaTopics }}"
             - name: LocalCache__Enabled
               value: "{{ .Values.permissions.settings.localCache.enabled }}"
             - name: LocalCache__TrackStatistics

charts/pro-api/templates/secrets.yaml

@@ -12,8 +12,8 @@ data:
   {{ if .Values.digger.password }}
   diggerPassword: {{ .Values.digger.password | b64enc }}
   {{ end }}
-  {{ if .Values.api.settings.auth.permissionsApiKey }}
-  permissionsApiKey: {{ required "Valid .Values.api.settings.auth.permissionsApiKey required!" .Values.api.settings.auth.permissionsApiKey | b64enc }}
+  {{ if .Values.permissions.settings.auth.apiKey }}
+  permissionsApiKey: {{ required "Valid .Values.permissions.settings.auth.apiKey required!" .Values.permissions.settings.auth.apiKey | b64enc }}
   {{ end }}
   {{ if .Values.elastic.credentials }}
   esCredentials: {{ .Values.elastic.credentials | b64enc }}