Skip to content

Commit

Permalink
обновили PRO API до версии 1.32.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmolochnikov
dmolochnikov committed Aug 8, 2024
1 parent 0bb2be5 commit b5e5c9a
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 161 deletions.
2 changes: 1 addition & 1 deletion charts/pro-api/Chart.yaml
View file
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: 1.26.0
appVersion: 1.22.0
appVersion: 1.32.0

maintainers:
- name: 2gis
Expand Down
30 changes: 15 additions & 15 deletions charts/pro-api/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
| Name | Description | Value |
| ------------------ | ----------- | ------------------------- |
| `image.repository` | Repository | `2gis-on-premise/pro-api` |
| `image.tag` | Tag | `1.22.0` |
| `image.tag` | Tag | `1.32.0` |
| `image.pullPolicy` | Pull Policy | `IfNotPresent` |

### 2GIS PRO Storage configuration
Expand Down Expand Up @@ -105,15 +105,16 @@

### Auth configuration

| Name | Description | Value |
| ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
| `auth.type` | Authentication type: 'none' - disabled, 'openid10' - [OpenId 1.0 / OAuth 2.0 authentication protocol](https://openid.net/specs/openid-connect-core-1_0.html), 'urbi' - urbi authentication protocol | `none` |
| `auth.url` | API URL of authentication service. Example: `http(s)://keycloak.ingress.host` | `""` |
| `auth.userInfoEndpoint` | The [UserInfo endpoint](https://openid.net/specs/openid-connect-core-1_0.html#UserInfo). Example: `realms/URBI_Pro/protocol/openid-connect/userinfo` | `""` |
| `auth.apiKey` | Secret API Key to perform authorized service actions, random string. Must be set if type not 'none'. Example: `4230b288-301e-4ec6-82c6-db6a8a72c2af` | `""` |
| `auth.permissionsApiKey` | Secret Permissions API Key to perform authorized service actions, random string. Must be set if type not 'none'. Example: `c7d74870-ec28-4543-b408-b49bfed84399` | `""` |
| `auth.turnOffCertValidation` | Turn off certificate validation for auth.url | `false` |
| `auth.shareKeys` | Secret keys for creating and validating shared links. Must contain at least 32 characters. All keys are used for validation. The last one is used for creation. Example: `m7nShlX1a8+IqE9ZcDqRCVjlhEud850ucT0av9bS+tcMTwIwUOUqpNikM+G8teDR` | `[]` |
| Name | Description | Value |
| ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
| `auth.type` | Authentication type: 'none' - disabled, 'openid10' - [OpenId 1.0 / OAuth 2.0 authentication protocol](https://openid.net/specs/openid-connect-core-1_0.html), 'urbi' - urbi authentication protocol | `none` |
| `auth.url` | API URL of authentication service. Example: `http(s)://keycloak.ingress.host` | `""` |
| `auth.userInfoEndpoint` | The [UserInfo endpoint](https://openid.net/specs/openid-connect-core-1_0.html#UserInfo). Example: `realms/URBI_Pro/protocol/openid-connect/userinfo` | `""` |
| `auth.wellKnownConfigEndpoint` | The [Well-Known Config endpoint](https://openid.net/specs/openid-connect-discovery-1_0.html). Example: `realms/URBI_Pro/.well-known/openid-configuration` | `""` |
| `auth.apiKey` | Secret API Key to perform authorized service actions, random string. Must be set if type not 'none'. Example: `4230b288-301e-4ec6-82c6-db6a8a72c2af` | `""` |
| `auth.permissionsApiKey` | Secret Permissions API Key to perform authorized service actions, random string. Must be set if type not 'none'. Example: `c7d74870-ec28-4543-b408-b49bfed84399` | `""` |
| `auth.turnOffCertValidation` | Turn off certificate validation for auth.url | `false` |
| `auth.shareKeys` | Secret keys for creating and validating shared links. Must contain at least 32 characters. All keys are used for validation. The last one is used for creation. Example: `m7nShlX1a8+IqE9ZcDqRCVjlhEud850ucT0av9bS+tcMTwIwUOUqpNikM+G8teDR` | `[]` |

### PostgreSQL settings

Expand Down Expand Up @@ -202,10 +203,9 @@

### 2GIS PRO API Job settings

| Name | Description | Value |
| -------------------------- | -------------------------- | --------------------- |
| `appAssetImporterName` | Data Import job name. | `asset-importer` |
| `appUserAssetImporterName` | User Data Import job name. | `user-asset-importer` |
| Name | Description | Value |
| ---------------------- | --------------------- | ---------------- |
| `appAssetImporterName` | Data Import job name. | `asset-importer` |

### 2GIS PRO Permissions API configuration

Expand All @@ -218,7 +218,7 @@
| Name | Description | Value |
| ------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ |
| `assetImporter.repository` | Docker Repository Image. | `2gis-on-premise/pro-importer` |
| `assetImporter.tag` | Docker image tag. | `1.22.0` |
| `assetImporter.tag` | Docker image tag. | `1.32.0` |
| `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` |
| `assetImporter.successfulJobsHistoryLimit` | How many completed and failed jobs should be kept. See [docs](https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/#jobs-history-limits). | `3` |
Expand Down
10 changes: 0 additions & 10 deletions charts/pro-api/templates/_helpers.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,6 @@
{{- end -}}
{{- end -}}

{{- define "pro-api.user-asset-importer-name" -}}
{{- $name := default .Values.appUserAssetImporterName -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}

{{- define "pro-api.asset-preparer-name" -}}
{{- $name := default .Values.appAssetPreparerName -}}
{{- if contains $name .Release.Name -}}
Expand All @@ -51,7 +42,6 @@
{{- end -}}
{{- end -}}


{{- define "pro-api.service-account-name" -}}
{{- if empty .Values.api.serviceAccountOverride }}
{{- $name := default .Values.api.serviceAccount -}}
Expand Down
21 changes: 14 additions & 7 deletions charts/pro-api/templates/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,16 @@ spec:
- name: http
containerPort: 8080
protocol: TCP
- name: management
containerPort: 8090
protocol: TCP
volumeMounts:
- mountPath: "{{ .Values.api.tempPath }}"
name: temp-volume
livenessProbe:
httpGet:
path: /health/live
port: http
port: management
failureThreshold: 5
initialDelaySeconds: 5
periodSeconds: 15
Expand All @@ -85,7 +88,7 @@ spec:
readinessProbe:
httpGet:
path: /health/ready
port: http
port: management
failureThreshold: 3
initialDelaySeconds: 5
periodSeconds: 5
Expand All @@ -94,7 +97,7 @@ spec:
startupProbe:
httpGet:
path: /health/live
port: http
port: management
failureThreshold: 20
initialDelaySeconds: 5
periodSeconds: 5
Expand All @@ -112,10 +115,8 @@ spec:
value: "{{ .Values.backgroundJobs.enableUserAssetsImporter }}"
- name: Import__EnableAssetsStreaming
value: "{{ .Values.backgroundJobs.enableAssetsStreaming }}"
- name: Import__CommonAssetsJobName
- name: Import__AssetImporterJobName
value: {{ include "pro-api.asset-importer-name" . }}
- name: Import__UserAssetsJobName
value: {{ include "pro-api.user-asset-importer-name" . }}
- name: Import__ExternalLinksProxyUrl
value: "{{ .Values.assetImporter.externalLinksProxyUrl }}"
- name: Import__ExternalLinksAllowedHosts
Expand Down Expand Up @@ -220,7 +221,7 @@ spec:
- name: Kafka__ImportTasksTopicSettings__ReaderGroupId
value: {{ $.Values.kafka.importTasksTopic.readerGroupId }}
- name: Kafka__AssetDataTopicSettings__Name
value: {{ $.Values.kafka.assetDataTopic.name }}
value: {{ required "A valid .Values.kafka.assetDataTopic.name entry required" $.Values.kafka.assetDataTopic.name }}
- name: Kafka__EventsTopicSettings__Name
value: {{ required "A valid .Values.kafka.eventsTopic.name entry required" $.Values.kafka.eventsTopic.name }}
- name: Kafka__EventsTopicSettings__ReaderGroupId
Expand All @@ -231,6 +232,8 @@ spec:
value: "{{ .Values.auth.url }}"
- name: Auth__UserInfoEndpoint
value: "{{ .Values.auth.userInfoEndpoint }}"
- name: Auth__WellKnownConfigEndpoint
value: "{{ .Values.auth.wellKnownConfigEndpoint }}"
- name: Auth__AutoRegisterUsers
value: "{{ .Values.auth.autoRegisterUsers }}"
- name: Auth__TurnOffCertValidation
Expand Down Expand Up @@ -297,3 +300,7 @@ spec:
value: "{{ .Values.api.localCache.trackStatistics }}"
- name: LicensingService__BaseUri
value: {{ required "A valid .Values.license.url entry required" $.Values.license.url }}
{{- range $i, $s := .Values.api.openApi.servers }}
- name: OpenApi__Servers__{{$i}}
value: "{{ $s }}"
{{- end }}
9 changes: 6 additions & 3 deletions charts/pro-api/templates/permissions-api-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,16 @@ spec:
- name: http
containerPort: 8081
protocol: TCP
- name: management
containerPort: 8091
protocol: TCP
volumeMounts:
- mountPath: "{{ .Values.api.tempPath }}"
name: temp-volume
livenessProbe:
httpGet:
path: /health/live
port: http
port: management
failureThreshold: 5
initialDelaySeconds: 5
periodSeconds: 15
Expand All @@ -81,7 +84,7 @@ spec:
readinessProbe:
httpGet:
path: /health/ready
port: http
port: management
failureThreshold: 3
initialDelaySeconds: 15
periodSeconds: 5
Expand All @@ -90,7 +93,7 @@ spec:
startupProbe:
httpGet:
path: /health/live
port: http
port: management
failureThreshold: 3
initialDelaySeconds: 15
periodSeconds: 5
Expand Down
112 changes: 0 additions & 112 deletions charts/pro-api/templates/user-asset-importer.yaml
View file

This file was deleted.

Loading

0 comments on commit b5e5c9a

Please sign in to comment.