Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions charts/pro-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: pro-ui
type: application
description: A Helm chart for Kubernetes to deploy 2GIS Pro UI service

version: 2.1.0
appVersion: 4.33.0
version: 2.2.0
appVersion: 4.43.0

maintainers:
- name: 2gis
Expand Down
23 changes: 13 additions & 10 deletions charts/pro-ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Use this Helm chart to deploy 2GIS Pro UI service, which is a part of 2GIS's [On
| Name | Description | Value |
| ------------------ | ----------- | ------------------------ |
| `image.repository` | Repository | `2gis-on-premise/pro-ui` |
| `image.tag` | Tag | `4.33.0` |
| `image.tag` | Tag | `4.43.0` |

### Common deployment settings

Expand Down Expand Up @@ -57,7 +57,7 @@ Use this Helm chart to deploy 2GIS Pro UI service, which is a part of 2GIS's [On
| `ui.appTheme` | Branding inside the app. Possible values: `"2gis"` or `"urbi"`. | `urbi` |
| `ui.appLocale` | Language in the app. Possible values: `"ar_AE"`, `"en_AE"` or `"ru_RU"`. | `en_AE` |
| `ui.appInitialMapCenter` | Default map coordinates, it contains of two numbers in an array: [lng, lat] (e.g., [55.27, 25.2] stands for Dubai, [37.64, 55.74] — for Moscow). | `[46.71, 24.72]` |
| `ui.supportDocumentationLink` | Product online documentation root link. Ex.: 'https://docs.urbi.ae/en/pro', 'https://docs.2gis.com/ru/pro' | `""` |
| `ui.supportDocumentationLink` | Product online documentation root link. Ex.: 'https://docs.urbi.ae/pro', 'https://docs.2gis.com/pro', 'https://docs.2gis.com/en/pro' | `""` |
| `ui.immersiveModels` | A string value for config to enabling 3D-models. Possible values: [{"id":4,"name":"Ground","mapOptions":{"center":[53.287567,23.564967],"styleZoom":19.2,"pitch":45,"rotation":0},"objects":[{"buildingIds":[],"coords":[53.284762,23.569323],"scale":90,"rotateX":0.5,"rotateY":0,"moveX":0,"moveY":0,"moveZ":0,"models":[{"path":"/static/models/adnoc/ground.glb","name":"Ground","displayName":"Ground"}]}]}] | `""` |
| `ui.publicS3Url` | Optional URL of public S3 where style data will be placed. Example: https://s3.domain.example.com/ | `""` |
| `ui.auth.sso` | Flag to turn on/off the authorization. Possible values: `"true"` or `"false"`. | `false` |
Expand Down Expand Up @@ -162,13 +162,16 @@ Use this Helm chart to deploy 2GIS Pro UI service, which is a part of 2GIS's [On

### Autoscaling configuration

| Name | Description | Value |
| ------------------ | ------------------------------------ | ------- |
| `hpa.enabled` | Enable hpa for PRO UI | `false` |
| `hpa.minReplicas` | Minimum number of PRO UI replicas | `2` |
| `hpa.maxReplicas` | Maximum number of PRO UI replicas | `5` |
| `hpa.targetCPU` | Target CPU utilization percentage | `100` |
| `hpa.targetMemory` | Target Memory utilization percentage | `""` |
| Name | Description | Value |
| -------------------- | ---------------------------------------------------- | ------- |
| `hpa.enabled` | Enable hpa for PRO UI | `false` |
| `hpa.minReplicas` | Minimum number of PRO UI replicas | `2` |
| `hpa.maxReplicas` | Maximum number of PRO UI replicas | `5` |
| `hpa.targetCPU` | Target CPU utilization percentage | `100` |
| `hpa.targetMemory` | Target Memory utilization percentage | `""` |
| `pdb.enabled` | If PDB is enabled for the service. | `false` |
| `pdb.minAvailable` | How many pods must be available after the eviction. | `""` |
| `pdb.maxUnavailable` | How many pods can be unavailable after the eviction. | `1` |

### Artifacts Storage settings

Expand All @@ -189,7 +192,7 @@ Use this Helm chart to deploy 2GIS Pro UI service, which is a part of 2GIS's [On
| ------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ |
| `stylesImporter.name` | Styles Import job name. | `styles-importer` |
| `stylesImporter.image.repository` | Docker Repository Image. | `2gis-on-premise/pro-importer` |
| `stylesImporter.image.tag` | Docker image tag. | `2.31.1` |
| `stylesImporter.image.tag` | Docker image tag. | `2.46.1` |
| `stylesImporter.backoffLimit` | The number of [retries](https://kubernetes.io/docs/concepts/workloads/controllers/job/#pod-backoff-failure-policy) before considering a Job as failed. | `2` |
| `stylesImporter.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` |
| `stylesImporter.nodeSelector` | Kubernetes [node selectors](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector). | `{}` |
Expand Down
21 changes: 21 additions & 0 deletions charts/pro-ui/templates/ui/pdb.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{{- with .Values.pdb -}}
{{- if .enabled }}
---
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ include "pro.ui.name" $ }}
labels:
{{- include "pro.ui.labels" $ | nindent 4 }}
spec:
{{- if .minAvailable }}
minAvailable: {{ .minAvailable }}
{{- end }}
{{- if .maxUnavailable }}
maxUnavailable: {{ .maxUnavailable }}
{{- end }}
selector:
matchLabels:
{{- include "pro.ui.selectorLabels" $ | nindent 6 }}
{{- end }}
{{- end }}
16 changes: 12 additions & 4 deletions charts/pro-ui/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ strategy:
# @param image.tag Tag
image:
repository: 2gis-on-premise/pro-ui
tag: 4.33.0
tag: 4.43.0

# @section Common deployment settings

Expand Down Expand Up @@ -70,7 +70,7 @@ ui:
# @param ui.appTheme Branding inside the app. Possible values: `"2gis"` or `"urbi"`.
# @param ui.appLocale Language in the app. Possible values: `"ar_AE"`, `"en_AE"` or `"ru_RU"`.
# @param ui.appInitialMapCenter Default map coordinates, it contains of two numbers in an array: [lng, lat] (e.g., [55.27, 25.2] stands for Dubai, [37.64, 55.74] — for Moscow).
# @param ui.supportDocumentationLink Product online documentation root link. Ex.: 'https://docs.urbi.ae/en/pro', 'https://docs.2gis.com/ru/pro'
# @param ui.supportDocumentationLink Product online documentation root link. Ex.: 'https://docs.urbi.ae/pro', 'https://docs.2gis.com/pro', 'https://docs.2gis.com/en/pro'
# @param ui.immersiveModels A string value for config to enabling 3D-models. Possible values: [{"id":4,"name":"Ground","mapOptions":{"center":[53.287567,23.564967],"styleZoom":19.2,"pitch":45,"rotation":0},"objects":[{"buildingIds":[],"coords":[53.284762,23.569323],"scale":90,"rotateX":0.5,"rotateY":0,"moveX":0,"moveY":0,"moveZ":0,"models":[{"path":"/static/models/adnoc/ground.glb","name":"Ground","displayName":"Ground"}]}]}]
# @param ui.publicS3Url Optional URL of public S3 where style data will be placed. Example: https://s3.domain.example.com/

Expand Down Expand Up @@ -265,8 +265,16 @@ hpa:
targetCPU: 100
targetMemory: ''

# @section Artifacts Storage settings
# @param pdb.enabled If PDB is enabled for the service.
# @param pdb.minAvailable How many pods must be available after the eviction.
# @param pdb.maxUnavailable How many pods can be unavailable after the eviction.
# if minAvailable and pdb.maxUnavailable are both set, only minAvailable is used
pdb:
enabled: false
minAvailable: ''
maxUnavailable: 1

# @section Artifacts Storage settings
# @param dgctlStorage.host S3 endpoint. Format: `host:port`. **Required**
# @param dgctlStorage.secure Set to `true` if dgctlStorage.host must be accessed via https. **Required**
# @param dgctlStorage.bucket S3 bucket name. **Required**
Expand Down Expand Up @@ -307,7 +315,7 @@ stylesImporter:
name: styles-importer
image:
repository: 2gis-on-premise/pro-importer
tag: 2.31.1
tag: 2.46.1
backoffLimit: 2
successfulJobsHistoryLimit: 3
nodeSelector: {}
Expand Down