Skip to content
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

Jump to bottom

[PRO-6552] upgrade pro-api and pro-ui versions, deliver dashboards #532

Merged
merged 11 commits into from
Nov 28, 2024
Merged

[PRO-6552] upgrade pro-api and pro-ui versions, deliver dashboards #532

merged 11 commits into from
Nov 28, 2024

Conversation

mount-li
Copy link
Collaborator

@mount-li mount-li commented Nov 7, 2024 •
edited
Loading

Pull Request description

Changelog

  • новая версия pro-ui 3.5.0 с новой фичей -- дашбордами
  • обновлены чарты для pro-api
  • новая версия pro-api 1.50.1

Issues

Breaking changes

  • If there are breaking changes, they need to be added to the file Breaking-Changes

Check-list. Чек-лист код-ревью

  • Запрос на слияние в develop.
  • Есть описание к PR.
  • Указаны блокирующие изменения. Breaking-Changes
  • Соответствие кода принятому стилю
    • Описание настроек.
    • Именование настроек.
    • Дефолтные значения.
    • Стиль кода.
  • Работоспособность. Разворачивается на своем окружении из ветки PR.
    • Тест API через тесты helmfile-хуков или коллекций Postman.
  • Не осталось мусора от удаления каких-то параметров. Ищется поиском по проекту из ветки PR.
  • Отработка линтера на чарт из ветки PR. Пример: helm lint charts/search-api

@mount-li mount-li requested a review from dmolochnikov November 7, 2024 07:23
@mount-li mount-li self-assigned this Nov 7, 2024
@mount-li mount-li requested review from a team as code owners November 7, 2024 07:23
@mount-li mount-li marked this pull request as draft November 7, 2024 07:23
@mount-li mount-li marked this pull request as ready for review November 7, 2024 09:11
@artem-malko
Copy link
Contributor

@endryhold подскажи, можем ли мы попобовать это тестово накатить в контуре партнера « Момрах»?

v-loboda
v-loboda approved these changes Nov 7, 2024
View reviewed changes
charts/pro-api/values.yaml Outdated
tag: 1.46.0
pullPolicy: IfNotPresent

# @skip tasks.ingress.enabled If Ingress is enabled for the service
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

тут куча лишних скипов появилась

@Skip tasks блокирует добавление документации для всего вложенного целиком, если внутри мешается документация каждого параметра - давай её просто уберём совсем

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Убрал документацию.

@mount-li mount-li force-pushed the PRO-6552-dashboards branch from 0cf36da to 16663b1 Compare November 25, 2024 08:08
@mount-li mount-li changed the title WIP: [PRO-6552] upgrade pro-api and pro-ui versions, deliver dashboards [PRO-6552] upgrade pro-api and pro-ui versions, deliver dashboards Nov 25, 2024
endryhold
endryhold reviewed Nov 25, 2024
View reviewed changes
charts/pro-api/values.yaml Outdated
tasks:

image:
repository: 2gis-on-premise/urbi-geo-tasks-api
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А давайте мы не будем что-то называть как urbi?)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Да, прошу прощения, исправил на pro-tasks-api.

@dbelyaev-nsk
Copy link
Contributor

задача на проверку https://jira.2gis.ru/browse/ONPREM-1261

dbelyaev-nsk
dbelyaev-nsk reviewed Nov 27, 2024
View reviewed changes
Breaking-Changes.md Outdated
Comment on lines 3 to 14
## [1.31.0]

### pro-api
- DB_CONNECTION_STRING renamed to Postgres__ConnectionString
- DB_CONNECTION_STRING_READONLY renamed to Postgres__ConnectionStringReadonly
- DB_CONNECTION_PWD renamed to Postgres__Password
- pro-api: removed management TCP port 8090; liveness and readiness probes use TCP port 8080
- permissions-api: removed management TCP port 8091; liveness and readiness probes use TCP port 8081

## pro-ui
- Using new UI based on dashboards
- Using mapgl v1.51.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

это больше инфа для нас, такое можно в чейнжлоге ПРа писать, это не ломающие изменения

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ты имеешь в виду часть про mapgl?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

не, про все, это внутренние изменения, пользователь их даже не заметит

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Удалил.

dbelyaev-nsk
dbelyaev-nsk reviewed Nov 27, 2024
View reviewed changes
charts/pro-api/values.yaml Outdated
@@ -393,7 +466,7 @@ s3:
resourcesBucket: ''


# @section PostgreSQL settings
# @section PostgreSQL settings (minimum supported version 15)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

это ломающее изменение, но в этой версии про вроде еще не используется функционал из 15 версии?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@v-loboda подскажи, пожалуйста, про постгрес 15.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Да, мы с ребятами уже говорили про обновление версии PG пару недель назад. На бою у нас уже 15, пока из 15 не используем ничего специфичного.

dbelyaev-nsk
dbelyaev-nsk reviewed Nov 27, 2024
View reviewed changes
charts/pro-api/values.yaml Outdated
Comment on lines 289 to 290
apiReplicaCount: 2
workerReplicaCount: 2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

минимильное количество реплик 2?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@v-loboda и про реплики тоже подскажи, пожалуйста.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

мы указываем рекомендуемые значения по-дефолту, минимальное 1

r9odt
r9odt reviewed Nov 28, 2024
View reviewed changes
charts/pro-ui/README.md Outdated
@@ -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 link. Ex.: 'https://docs.urbi.ae/en/pro/start', 'https://docs.2gis.com/ru/pro/start' | `""` |
| `ui.supportDocumentationLink` | Product online documentation link. Ex.: 'https://docs.urbi.ae/en/pro', 'https://docs.2gis.com/ru/pro' | `""` |
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Прошлая ссылка была правильной

@dbelyaev-nsk dbelyaev-nsk merged commit 4ee8ffa into develop Nov 28, 2024
2 checks passed
@dbelyaev-nsk dbelyaev-nsk deleted the PRO-6552-dashboards branch November 28, 2024 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@v-loboda v-loboda v-loboda approved these changes

@endryhold endryhold endryhold left review comments

@r9odt r9odt r9odt left review comments

@dbelyaev-nsk dbelyaev-nsk dbelyaev-nsk approved these changes

@dmolochnikov dmolochnikov Awaiting requested review from dmolochnikov

@artem-malko artem-malko Awaiting requested review from artem-malko

Assignees

@mount-li mount-li

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mount-li @artem-malko @dbelyaev-nsk @r9odt @endryhold @v-loboda @golovanovsv