From d318ea3f162df11e536af70b2a77915aaeed7fa4 Mon Sep 17 00:00:00 2001 From: diamondrigido Date: Fri, 30 Oct 2026 16:46:21 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD?= =?UTF-8?q?=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. outbox-relay для кафка 2. маршрутизация --- .../base/cde-api-worker-copy.yaml | 21 +- .../base/cde-api-worker-move.yaml | 21 +- .../cde-api-worker-s32d-create-upload.yaml | 21 +- .../cde-api-worker-s32d-handle-error.yaml | 21 +- ...cde-api-worker-s32d-process-workflows.yaml | 21 +- ...cde-api-worker-s32d-publish-documents.yaml | 21 +- apps/documentations/base/cde-api.yaml | 22 +- apps/documentations/base/kustomization.yaml | 1 + apps/documentations/base/outbox-relay.yaml | 149 +++++++++++ .../brusnika-prod/cde-api-worker-copy.yaml | 21 +- .../brusnika-prod/cde-api-worker-move.yaml | 21 +- .../cde-api-worker-s32d-create-upload.yaml | 21 +- .../cde-api-worker-s32d-handle-error.yaml | 21 +- ...cde-api-worker-s32d-process-workflows.yaml | 21 +- ...cde-api-worker-s32d-publish-documents.yaml | 21 +- .../documentations/brusnika-prod/cde-api.yaml | 22 +- .../brusnika-prod/kustomization.yaml | 1 + .../brusnika-prod/outbox-relay.yaml | 130 ++++++++++ .../brusnika-stage/cde-api-worker-copy.yaml | 27 +- .../brusnika-stage/cde-api-worker-move.yaml | 27 +- .../cde-api-worker-s32d-create-upload.yaml | 25 +- .../cde-api-worker-s32d-handle-error.yaml | 25 +- ...cde-api-worker-s32d-process-workflows.yaml | 27 +- ...cde-api-worker-s32d-publish-documents.yaml | 25 +- .../brusnika-stage/cde-api.yaml | 32 +-- .../brusnika-stage/kustomization.yaml | 1 + .../brusnika-stage/outbox-relay.yaml | 130 ++++++++++ apps/documentations/cde-api.CONFIGURATION.md | 55 ++-- apps/documentations/cde-api.ENDPOINTS.md | 1 - apps/documentations/cde-api.env.example | 14 +- .../d8-ugmk-prod/cde-api-worker-copy.yaml | 236 ++++++++++++++++++ .../d8-ugmk-prod/cde-api-worker-move.yaml | 218 ++++++++++++++++ .../cde-api-worker-s32d-create-upload.yaml | 125 ++++++++++ .../cde-api-worker-s32d-handle-error.yaml | 119 +++++++++ ...cde-api-worker-s32d-process-workflows.yaml | 188 ++++++++++++++ ...cde-api-worker-s32d-publish-documents.yaml | 134 ++++++++++ apps/documentations/d8-ugmk-prod/cde-api.yaml | 20 +- .../d8-ugmk-prod/kustomization.yaml | 26 +- .../outbox-relay.CONFIGURATION.md | 44 ++++ .../ugok/cde-api-worker-copy.yaml | 23 +- .../ugok/cde-api-worker-move.yaml | 23 +- .../cde-api-worker-s32d-create-upload.yaml | 23 +- .../cde-api-worker-s32d-handle-error.yaml | 23 +- ...cde-api-worker-s32d-process-workflows.yaml | 23 +- ...cde-api-worker-s32d-publish-documents.yaml | 23 +- apps/documentations/ugok/cde-api.yaml | 24 +- apps/documentations/ugok/kustomization.yaml | 1 + apps/documentations/ugok/outbox-relay.yaml | 130 ++++++++++ .../uralkal/cde-api-worker-copy.yaml | 236 ++++++++++++++++++ .../uralkal/cde-api-worker-move.yaml | 218 ++++++++++++++++ .../cde-api-worker-s32d-create-upload.yaml | 125 ++++++++++ .../cde-api-worker-s32d-handle-error.yaml | 119 +++++++++ ...cde-api-worker-s32d-process-workflows.yaml | 188 ++++++++++++++ ...cde-api-worker-s32d-publish-documents.yaml | 134 ++++++++++ apps/documentations/uralkal/cde-api.yaml | 24 +- .../documentations/uralkal/kustomization.yaml | 24 ++ .../vad/cde-api-worker-copy.yaml | 236 ++++++++++++++++++ .../vad/cde-api-worker-move.yaml | 218 ++++++++++++++++ .../cde-api-worker-s32d-create-upload.yaml | 125 ++++++++++ .../vad/cde-api-worker-s32d-handle-error.yaml | 119 +++++++++ ...cde-api-worker-s32d-process-workflows.yaml | 188 ++++++++++++++ ...cde-api-worker-s32d-publish-documents.yaml | 134 ++++++++++ apps/documentations/vad/cde-api.yaml | 24 +- apps/documentations/vad/kustomization.yaml | 24 ++ .../wb/cde-api-worker-copy.yaml | 23 +- .../wb/cde-api-worker-move.yaml | 23 +- .../wb/cde-api-worker-s32d-create-upload.yaml | 23 +- .../wb/cde-api-worker-s32d-handle-error.yaml | 23 +- ...cde-api-worker-s32d-process-workflows.yaml | 23 +- ...cde-api-worker-s32d-publish-documents.yaml | 23 +- apps/documentations/wb/cde-api.yaml | 24 +- apps/documentations/wb/kustomization.yaml | 1 + apps/documentations/wb/outbox-relay.yaml | 130 ++++++++++ docs/apps/documentations.md | 9 +- .../brusnika-prod/istio-config.yaml | 29 +++ .../brusnika-stage/istio-config.yaml | 26 ++ .../d8-ugmk-prod/istio-config.yaml | 22 +- .../istio-config/uralkal/istio-config.yaml | 22 +- .../istio-config/vad/istio-config.yaml | 22 +- 79 files changed, 4180 insertions(+), 748 deletions(-) create mode 100644 apps/documentations/base/outbox-relay.yaml create mode 100644 apps/documentations/brusnika-prod/outbox-relay.yaml create mode 100644 apps/documentations/brusnika-stage/outbox-relay.yaml create mode 100644 apps/documentations/d8-ugmk-prod/cde-api-worker-copy.yaml create mode 100644 apps/documentations/d8-ugmk-prod/cde-api-worker-move.yaml create mode 100644 apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-create-upload.yaml create mode 100644 apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-handle-error.yaml create mode 100644 apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-process-workflows.yaml create mode 100644 apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-publish-documents.yaml create mode 100644 apps/documentations/outbox-relay.CONFIGURATION.md create mode 100644 apps/documentations/ugok/outbox-relay.yaml create mode 100644 apps/documentations/uralkal/cde-api-worker-copy.yaml create mode 100644 apps/documentations/uralkal/cde-api-worker-move.yaml create mode 100644 apps/documentations/uralkal/cde-api-worker-s32d-create-upload.yaml create mode 100644 apps/documentations/uralkal/cde-api-worker-s32d-handle-error.yaml create mode 100644 apps/documentations/uralkal/cde-api-worker-s32d-process-workflows.yaml create mode 100644 apps/documentations/uralkal/cde-api-worker-s32d-publish-documents.yaml create mode 100644 apps/documentations/vad/cde-api-worker-copy.yaml create mode 100644 apps/documentations/vad/cde-api-worker-move.yaml create mode 100644 apps/documentations/vad/cde-api-worker-s32d-create-upload.yaml create mode 100644 apps/documentations/vad/cde-api-worker-s32d-handle-error.yaml create mode 100644 apps/documentations/vad/cde-api-worker-s32d-process-workflows.yaml create mode 100644 apps/documentations/vad/cde-api-worker-s32d-publish-documents.yaml create mode 100644 apps/documentations/wb/outbox-relay.yaml diff --git a/apps/documentations/base/cde-api-worker-copy.yaml b/apps/documentations/base/cde-api-worker-copy.yaml index 4627a68..43783c4 100644 --- a/apps/documentations/base/cde-api-worker-copy.yaml +++ b/apps/documentations/base/cde-api-worker-copy.yaml @@ -77,24 +77,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-copy" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -104,9 +92,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-copy" - name: CDE_API_SYSTEMLOG_BASE_URL value: _default: "http://backend-svc.system-log.svc.cluster.local:80" @@ -163,13 +148,13 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/base/cde-api-worker-move.yaml b/apps/documentations/base/cde-api-worker-move.yaml index efa12a0..8654fa2 100644 --- a/apps/documentations/base/cde-api-worker-move.yaml +++ b/apps/documentations/base/cde-api-worker-move.yaml @@ -77,24 +77,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-move" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -104,9 +92,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-move" - name: CDE_API_SYSTEMLOG_BASE_URL value: _default: "http://backend-svc.system-log.svc.cluster.local:80" @@ -163,13 +148,13 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/base/cde-api-worker-s32d-create-upload.yaml b/apps/documentations/base/cde-api-worker-s32d-create-upload.yaml index ecb4a34..0997de8 100644 --- a/apps/documentations/base/cde-api-worker-s32d-create-upload.yaml +++ b/apps/documentations/base/cde-api-worker-s32d-create-upload.yaml @@ -76,24 +76,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-create-upload" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -103,9 +91,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-create-upload" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -156,13 +141,13 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/base/cde-api-worker-s32d-handle-error.yaml b/apps/documentations/base/cde-api-worker-s32d-handle-error.yaml index 2433a1f..f2930ff 100644 --- a/apps/documentations/base/cde-api-worker-s32d-handle-error.yaml +++ b/apps/documentations/base/cde-api-worker-s32d-handle-error.yaml @@ -76,24 +76,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-handle-error" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -103,9 +91,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-handle-error" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -156,13 +141,13 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/base/cde-api-worker-s32d-process-workflows.yaml b/apps/documentations/base/cde-api-worker-s32d-process-workflows.yaml index ba6f442..849438d 100644 --- a/apps/documentations/base/cde-api-worker-s32d-process-workflows.yaml +++ b/apps/documentations/base/cde-api-worker-s32d-process-workflows.yaml @@ -76,24 +76,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-process-workflows" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -103,9 +91,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-process-workflows" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -156,13 +141,13 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/base/cde-api-worker-s32d-publish-documents.yaml b/apps/documentations/base/cde-api-worker-s32d-publish-documents.yaml index 1597ef6..ff6d24b 100644 --- a/apps/documentations/base/cde-api-worker-s32d-publish-documents.yaml +++ b/apps/documentations/base/cde-api-worker-s32d-publish-documents.yaml @@ -76,24 +76,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-publish-documents" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -103,9 +91,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-publish-documents" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -156,13 +141,13 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/base/cde-api.yaml b/apps/documentations/base/cde-api.yaml index 9612bde..5f872dd 100644 --- a/apps/documentations/base/cde-api.yaml +++ b/apps/documentations/base/cde-api.yaml @@ -94,12 +94,6 @@ spec: - name: CDE_API_APP_NAME value: _default: "cde-api" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "debug" @@ -120,13 +114,7 @@ spec: _default: "96" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -261,7 +249,7 @@ spec: _default: "false" - name: CDE_API_DATABASE_OBSERVABILITY_ENABLE value: - _default: "true" + _default: "false" - name: CDE_API_REDIS__DB value: _default: "5" @@ -291,7 +279,7 @@ spec: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_S3_USE_SSL value: _default: "true" @@ -300,7 +288,7 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" @@ -324,7 +312,7 @@ spec: _default: "http://backend-svc.django.svc.cluster.local:80" - name: CDE_API_DISK_BUCKET_NAMESPACE value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_USERS_ORIGINATOR value: _default: "docs_prod" diff --git a/apps/documentations/base/kustomization.yaml b/apps/documentations/base/kustomization.yaml index 1c7ea30..bf55ade 100644 --- a/apps/documentations/base/kustomization.yaml +++ b/apps/documentations/base/kustomization.yaml @@ -20,3 +20,4 @@ resources: - cde-api-worker-s32d-handle-error.yaml - cde-api-worker-copy.yaml - cde-api-worker-move.yaml + - outbox-relay.yaml diff --git a/apps/documentations/base/outbox-relay.yaml b/apps/documentations/base/outbox-relay.yaml new file mode 100644 index 0000000..8b62fe1 --- /dev/null +++ b/apps/documentations/base/outbox-relay.yaml @@ -0,0 +1,149 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: outbox-relay + namespace: documentations +spec: + interval: 10m + chart: + spec: + chart: universal-chart + version: "0.1.9" + sourceRef: + kind: HelmRepository + name: yc-oci-charts + namespace: flux-system + interval: 10m + install: + remediation: + retries: 3 + upgrade: + remediation: + retries: 3 + values: + global: + env: _default + services: + outbox-relay: + enabled: true + serviceAccount: + enabled: + _default: true + name: + _default: documentations-vault + deployment: + enabled: true + name: + _default: outbox-relay + replicaCount: + _default: 1 + revisionHistoryLimit: + _default: 5 + resources: + requests: + cpu: + _default: 100m + memory: + _default: 128Mi + command: + _default: ["/bin/sh", "-ec"] + args: + _default: + - | + set -a + [ -f /vault/secrets/outbox-relay-postgres ] && . /vault/secrets/outbox-relay-postgres + [ -f /vault/secrets/outbox-relay-kafka ] && . /vault/secrets/outbox-relay-kafka + set +a + exec /opt/relay + image: + name: + _default: cr.yandex/crp3ccidau046kdj8g9q/outbox-relay:prod_bee3b2a + pullPolicy: + _default: IfNotPresent + service: + enabled: false + imagePullSecrets: + enabled: + _default: true + name: + _default: regcred + envs: + - name: OUTBOX_RELAY_APP_NAME + value: + _default: "cde-api-outbox-relay" + - name: OUTBOX_RELAY_APP_VERSION + value: + _default: "0.1.0" + - name: OUTBOX_RELAY_LOG_LEVEL + value: + _default: "info" + - name: OUTBOX_RELAY_SOURCE_SERVICE + value: + _default: "cde-api" + - name: OUTBOX_RELAY_SOURCE_VERSION + value: + _default: "0.1.0" + - name: OUTBOX_RELAY_PG__SSLMODE + value: + _default: "disable" + - name: OUTBOX_RELAY_PG__POOL_MIN + value: + _default: "1" + - name: OUTBOX_RELAY_PG__POOL_MAX + value: + _default: "3" + - name: OUTBOX_RELAY_PG__TABLE + value: + _default: "outbox" + - name: OUTBOX_RELAY_POLL_INTERVAL + value: + _default: "500ms" + - name: OUTBOX_RELAY_BATCH_SIZE + value: + _default: "100" + - name: OUTBOX_RELAY_MAX_ATTEMPTS + value: + _default: "8" + - name: OUTBOX_RELAY_INITIAL_BACKOFF + value: + _default: "1s" + - name: OUTBOX_RELAY_MAX_BACKOFF + value: + _default: "5m" + - name: OUTBOX_RELAY_SHUTDOWN_TIMEOUT + value: + _default: "30s" + - name: OUTBOX_RELAY_KAFKA__BROKERS + value: + _default: "kafka-kafka-contour.kafka.svc.cluster.local:9092" + - name: OUTBOX_RELAY_KAFKA__SECURITY_PROTOCOL + value: + _default: "SASL_SSL" + - name: OUTBOX_RELAY_KAFKA__INSECURE_SKIP_VERIFY + value: + _default: "true" + podAnnotations: + _default: + traffic.sidecar.istio.io/excludeOutboundPorts: "4317,4318,9411,8200" + vault.hashicorp.com/agent-init-first: "true" + vault.hashicorp.com/agent-inject: "true" + vault.hashicorp.com/agent-pre-populate-only: "true" + vault.hashicorp.com/auth-path: auth/kubernetes + vault.hashicorp.com/role: documentations + vault.hashicorp.com/agent-inject-secret-outbox-relay-postgres: secrets/data/apps/documentations/postgres + vault.hashicorp.com/agent-inject-template-outbox-relay-postgres: |- + {{- with secret "secrets/data/apps/documentations/postgres" -}} + OUTBOX_RELAY_PG__HOST={{ index .Data.data "host" }} + OUTBOX_RELAY_PG__PORT={{ index .Data.data "port" }} + OUTBOX_RELAY_PG__NAME={{ index .Data.data "database" }} + OUTBOX_RELAY_PG__USER={{ index .Data.data "username" }} + OUTBOX_RELAY_PG__PASSWORD={{ index .Data.data "password" }} + {{- end -}} + vault.hashicorp.com/agent-inject-secret-outbox-relay-kafka: secrets/data/kafka/apps/documentations + vault.hashicorp.com/agent-inject-template-outbox-relay-kafka: |- + {{- with secret "secrets/data/kafka/apps/documentations" -}} + OUTBOX_RELAY_KAFKA__SASL_MECHANISM={{ if .Data.data.auth }}{{ index .Data.data.auth "sasl_mechanism" }}{{ else }}{{ index .Data.data "sasl_mechanism" }}{{ end }} + OUTBOX_RELAY_KAFKA__SASL_USERNAME={{ index .Data.data "username" }} + OUTBOX_RELAY_KAFKA__SASL_PASSWORD={{ index .Data.data "password" }} + {{- end -}} diff --git a/apps/documentations/brusnika-prod/cde-api-worker-copy.yaml b/apps/documentations/brusnika-prod/cde-api-worker-copy.yaml index 0c877fc..764b1fa 100644 --- a/apps/documentations/brusnika-prod/cde-api-worker-copy.yaml +++ b/apps/documentations/brusnika-prod/cde-api-worker-copy.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-copy" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-copy" - name: CDE_API_SYSTEMLOG_BASE_URL value: _default: "http://api-service.system-log.svc.cluster.local:80" @@ -146,13 +131,13 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/brusnika-prod/cde-api-worker-move.yaml b/apps/documentations/brusnika-prod/cde-api-worker-move.yaml index f8b8916..02fdbaa 100644 --- a/apps/documentations/brusnika-prod/cde-api-worker-move.yaml +++ b/apps/documentations/brusnika-prod/cde-api-worker-move.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-move" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-move" - name: CDE_API_SYSTEMLOG_BASE_URL value: _default: "http://api-service.system-log.svc.cluster.local:80" @@ -146,13 +131,13 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/brusnika-prod/cde-api-worker-s32d-create-upload.yaml b/apps/documentations/brusnika-prod/cde-api-worker-s32d-create-upload.yaml index b6b2001..9397558 100644 --- a/apps/documentations/brusnika-prod/cde-api-worker-s32d-create-upload.yaml +++ b/apps/documentations/brusnika-prod/cde-api-worker-s32d-create-upload.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-create-upload" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-create-upload" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -140,13 +125,13 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/brusnika-prod/cde-api-worker-s32d-handle-error.yaml b/apps/documentations/brusnika-prod/cde-api-worker-s32d-handle-error.yaml index a2af1bf..a600a02 100644 --- a/apps/documentations/brusnika-prod/cde-api-worker-s32d-handle-error.yaml +++ b/apps/documentations/brusnika-prod/cde-api-worker-s32d-handle-error.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-handle-error" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-handle-error" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -140,13 +125,13 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/brusnika-prod/cde-api-worker-s32d-process-workflows.yaml b/apps/documentations/brusnika-prod/cde-api-worker-s32d-process-workflows.yaml index 6cd81ff..3c36e75 100644 --- a/apps/documentations/brusnika-prod/cde-api-worker-s32d-process-workflows.yaml +++ b/apps/documentations/brusnika-prod/cde-api-worker-s32d-process-workflows.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-process-workflows" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-process-workflows" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -140,13 +125,13 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/brusnika-prod/cde-api-worker-s32d-publish-documents.yaml b/apps/documentations/brusnika-prod/cde-api-worker-s32d-publish-documents.yaml index 0c347d6..be6080c 100644 --- a/apps/documentations/brusnika-prod/cde-api-worker-s32d-publish-documents.yaml +++ b/apps/documentations/brusnika-prod/cde-api-worker-s32d-publish-documents.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-publish-documents" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-publish-documents" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -140,13 +125,13 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/brusnika-prod/cde-api.yaml b/apps/documentations/brusnika-prod/cde-api.yaml index 1b16961..3e33af5 100644 --- a/apps/documentations/brusnika-prod/cde-api.yaml +++ b/apps/documentations/brusnika-prod/cde-api.yaml @@ -75,12 +75,6 @@ spec: - name: CDE_API_APP_NAME value: _default: "cde-api" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "debug" @@ -101,13 +95,7 @@ spec: _default: "96" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -242,7 +230,7 @@ spec: _default: "false" - name: CDE_API_DATABASE_OBSERVABILITY_ENABLE value: - _default: "true" + _default: "false" - name: CDE_API_REDIS__DB value: _default: "5" @@ -272,7 +260,7 @@ spec: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_S3_USE_SSL value: _default: "true" @@ -281,7 +269,7 @@ spec: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" @@ -305,7 +293,7 @@ spec: _default: "http://backend.django.svc.cluster.local:8000" - name: CDE_API_DISK_BUCKET_NAMESPACE value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_USERS_ORIGINATOR value: _default: "docs_prod" diff --git a/apps/documentations/brusnika-prod/kustomization.yaml b/apps/documentations/brusnika-prod/kustomization.yaml index 7b4b4ab..5b86d72 100644 --- a/apps/documentations/brusnika-prod/kustomization.yaml +++ b/apps/documentations/brusnika-prod/kustomization.yaml @@ -16,3 +16,4 @@ resources: - cde-api-worker-s32d-handle-error.yaml - cde-api-worker-copy.yaml - cde-api-worker-move.yaml + - outbox-relay.yaml diff --git a/apps/documentations/brusnika-prod/outbox-relay.yaml b/apps/documentations/brusnika-prod/outbox-relay.yaml new file mode 100644 index 0000000..aeb6184 --- /dev/null +++ b/apps/documentations/brusnika-prod/outbox-relay.yaml @@ -0,0 +1,130 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: outbox-relay + namespace: documentations +spec: + interval: 10m + chart: + spec: + chart: universal-chart + version: "0.1.7" + sourceRef: + kind: HelmRepository + name: yc-oci-charts + namespace: flux-system + interval: 10m + install: + remediation: + retries: 3 + upgrade: + remediation: + retries: 3 + values: + global: + env: _default + services: + outbox-relay: + enabled: true + deployment: + enabled: true + name: + _default: outbox-relay + replicaCount: + _default: 1 + revisionHistoryLimit: + _default: 5 + resources: + requests: + cpu: + _default: 100m + memory: + _default: 128Mi + image: + name: + _default: cr.yandex/crp3ccidau046kdj8g9q/outbox-relay:prod_bee3b2a + pullPolicy: + _default: IfNotPresent + service: + enabled: false + imagePullSecrets: + enabled: + _default: true + name: + _default: regcred + envs: + - name: OUTBOX_RELAY_APP_NAME + value: + _default: "cde-api-outbox-relay" + - name: OUTBOX_RELAY_APP_VERSION + value: + _default: "0.1.0" + - name: OUTBOX_RELAY_LOG_LEVEL + value: + _default: "info" + - name: OUTBOX_RELAY_SOURCE_SERVICE + value: + _default: "cde-api" + - name: OUTBOX_RELAY_SOURCE_VERSION + value: + _default: "0.1.0" + - name: OUTBOX_RELAY_PG__SSLMODE + value: + _default: "disable" + - name: OUTBOX_RELAY_PG__POOL_MIN + value: + _default: "1" + - name: OUTBOX_RELAY_PG__POOL_MAX + value: + _default: "3" + - name: OUTBOX_RELAY_PG__TABLE + value: + _default: "outbox" + - name: OUTBOX_RELAY_PG__HOST + value: + _default: "postgres-service" + - name: OUTBOX_RELAY_PG__PORT + value: + _default: "5432" + - name: OUTBOX_RELAY_PG__NAME + value: + _default: "documentations" + - name: OUTBOX_RELAY_POLL_INTERVAL + value: + _default: "500ms" + - name: OUTBOX_RELAY_BATCH_SIZE + value: + _default: "100" + - name: OUTBOX_RELAY_MAX_ATTEMPTS + value: + _default: "8" + - name: OUTBOX_RELAY_INITIAL_BACKOFF + value: + _default: "1s" + - name: OUTBOX_RELAY_MAX_BACKOFF + value: + _default: "5m" + - name: OUTBOX_RELAY_SHUTDOWN_TIMEOUT + value: + _default: "30s" + - name: OUTBOX_RELAY_KAFKA__BROKERS + value: + _default: "brusnika-stage-kafka-bootstrap.kafka.svc.cluster.local:9093" + - name: OUTBOX_RELAY_KAFKA__SECURITY_PROTOCOL + value: + _default: "SSL" + - name: OUTBOX_RELAY_KAFKA__INSECURE_SKIP_VERIFY + value: + _default: "true" + secretEnvs: + - name: OUTBOX_RELAY_PG__USER + secretName: + _default: "postgres-secret" + secretKey: + _default: "username" + - name: OUTBOX_RELAY_PG__PASSWORD + secretName: + _default: "postgres-secret" + secretKey: + _default: "password" diff --git a/apps/documentations/brusnika-stage/cde-api-worker-copy.yaml b/apps/documentations/brusnika-stage/cde-api-worker-copy.yaml index dc72222..c6dfdd3 100644 --- a/apps/documentations/brusnika-stage/cde-api-worker-copy.yaml +++ b/apps/documentations/brusnika-stage/cde-api-worker-copy.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-copy" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-copy" - name: CDE_API_SYSTEMLOG_BASE_URL value: _default: "http://api-service.system-log.svc.cluster.local:80" @@ -140,25 +125,25 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-stage" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" - name: CDE_API_MAILER_BASE_URL value: - _default: "http://mailer-service.generic:8000" + _default: "http://mailer-service.mailer:8000" - name: CDE_API_MAILER_FROM_EMAIL value: _default: "noreply@sarex.io" @@ -191,7 +176,7 @@ spec: _default: "cr.yandex/crp3ccidau046kdj8g9q" - name: CDE_API_WORKFLOWS_IMAGES_VERSION value: - _default: "develop" + _default: "master" - name: CDE_API_DJANGO_HOST value: _default: "http://backend.django.svc.cluster.local:8000" diff --git a/apps/documentations/brusnika-stage/cde-api-worker-move.yaml b/apps/documentations/brusnika-stage/cde-api-worker-move.yaml index f9b52c5..bc986d1 100644 --- a/apps/documentations/brusnika-stage/cde-api-worker-move.yaml +++ b/apps/documentations/brusnika-stage/cde-api-worker-move.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-move" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-move" - name: CDE_API_SYSTEMLOG_BASE_URL value: _default: "http://api-service.system-log.svc.cluster.local:80" @@ -140,25 +125,25 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-stage" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" - name: CDE_API_MAILER_BASE_URL value: - _default: "http://mailer-service.generic:8000" + _default: "http://mailer-service.mailer:8000" - name: CDE_API_MAILER_FROM_EMAIL value: _default: "noreply@sarex.io" @@ -191,7 +176,7 @@ spec: _default: "cr.yandex/crp3ccidau046kdj8g9q" - name: CDE_API_WORKFLOWS_IMAGES_VERSION value: - _default: "develop" + _default: "master" - name: CDE_API_DJANGO_HOST value: _default: "http://backend.django.svc.cluster.local:8000" diff --git a/apps/documentations/brusnika-stage/cde-api-worker-s32d-create-upload.yaml b/apps/documentations/brusnika-stage/cde-api-worker-s32d-create-upload.yaml index 2e5067f..d4f9ba2 100644 --- a/apps/documentations/brusnika-stage/cde-api-worker-s32d-create-upload.yaml +++ b/apps/documentations/brusnika-stage/cde-api-worker-s32d-create-upload.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-create-upload" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-create-upload" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -134,19 +119,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-stage" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" @@ -164,7 +149,7 @@ spec: _default: "2" - name: CDE_API_MAILER_BASE_URL value: - _default: "http://mailer-service.generic:8000" + _default: "http://mailer-service.mailer:8000" - name: CDE_API_MAILER_FROM_EMAIL value: _default: "noreply@sarex.io" diff --git a/apps/documentations/brusnika-stage/cde-api-worker-s32d-handle-error.yaml b/apps/documentations/brusnika-stage/cde-api-worker-s32d-handle-error.yaml index cd6ce75..b3534e3 100644 --- a/apps/documentations/brusnika-stage/cde-api-worker-s32d-handle-error.yaml +++ b/apps/documentations/brusnika-stage/cde-api-worker-s32d-handle-error.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-handle-error" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-handle-error" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -134,19 +119,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-stage" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" @@ -158,7 +143,7 @@ spec: _default: "4" - name: CDE_API_MAILER_BASE_URL value: - _default: "http://mailer-service.generic:8000" + _default: "http://mailer-service.mailer:8000" - name: CDE_API_MAILER_FROM_EMAIL value: _default: "noreply@sarex.io" diff --git a/apps/documentations/brusnika-stage/cde-api-worker-s32d-process-workflows.yaml b/apps/documentations/brusnika-stage/cde-api-worker-s32d-process-workflows.yaml index 786b1bb..9803f33 100644 --- a/apps/documentations/brusnika-stage/cde-api-worker-s32d-process-workflows.yaml +++ b/apps/documentations/brusnika-stage/cde-api-worker-s32d-process-workflows.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-process-workflows" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-process-workflows" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -134,19 +119,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-stage" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" @@ -158,7 +143,7 @@ spec: _default: "1" - name: CDE_API_MAILER_BASE_URL value: - _default: "http://mailer-service.generic:8000" + _default: "http://mailer-service.mailer:8000" - name: CDE_API_MAILER_FROM_EMAIL value: _default: "noreply@sarex.io" @@ -191,7 +176,7 @@ spec: _default: "cr.yandex/crp3ccidau046kdj8g9q" - name: CDE_API_WORKFLOWS_IMAGES_VERSION value: - _default: "develop" + _default: "master" - name: CDE_API_DJANGO_HOST value: _default: "http://backend.django.svc.cluster.local:8000" diff --git a/apps/documentations/brusnika-stage/cde-api-worker-s32d-publish-documents.yaml b/apps/documentations/brusnika-stage/cde-api-worker-s32d-publish-documents.yaml index 24546a0..1ade7b5 100644 --- a/apps/documentations/brusnika-stage/cde-api-worker-s32d-publish-documents.yaml +++ b/apps/documentations/brusnika-stage/cde-api-worker-s32d-publish-documents.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-publish-documents" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-publish-documents" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -134,19 +119,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-stage" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" @@ -158,7 +143,7 @@ spec: _default: "2" - name: CDE_API_MAILER_BASE_URL value: - _default: "http://mailer-service.generic:8000" + _default: "http://mailer-service.mailer:8000" - name: CDE_API_MAILER_FROM_EMAIL value: _default: "noreply@sarex.io" diff --git a/apps/documentations/brusnika-stage/cde-api.yaml b/apps/documentations/brusnika-stage/cde-api.yaml index a9d0138..ef7263f 100644 --- a/apps/documentations/brusnika-stage/cde-api.yaml +++ b/apps/documentations/brusnika-stage/cde-api.yaml @@ -68,19 +68,13 @@ spec: envs: - name: CDE_API_RESOURCES_BASE_URL value: - _default: "http://iams.platform.svc.cluster.local:8080" + _default: "http://iams.iam.svc.cluster.local:8080" - name: CDE_API_RESOURCES_TIMEOUT value: _default: "10s" - name: CDE_API_APP_NAME value: _default: "cde-api" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "debug" @@ -101,13 +95,7 @@ spec: _default: "96" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -170,7 +158,7 @@ spec: _default: "cr.yandex/crp3ccidau046kdj8g9q" - name: CDE_API_WORKFLOWS_IMAGES_VERSION value: - _default: "develop" + _default: "master" - name: CDE_API_DJANGO_HOST value: _default: "http://backend.django.svc.cluster.local:8000" @@ -242,7 +230,7 @@ spec: _default: "false" - name: CDE_API_DATABASE_OBSERVABILITY_ENABLE value: - _default: "true" + _default: "false" - name: CDE_API_REDIS__DB value: _default: "5" @@ -272,16 +260,16 @@ spec: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-stage" + _default: "documentations" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" @@ -305,16 +293,16 @@ spec: _default: "http://backend.django.svc.cluster.local:8000" - name: CDE_API_DISK_BUCKET_NAMESPACE value: - _default: "documentations-stage" + _default: "documentations" - name: CDE_API_USERS_ORIGINATOR value: - _default: "docs_stage" + _default: "docs_prod" - name: CDE_API_USERS_TIMEOUT_MS value: _default: "10000" - name: CDE_API_MAILER_BASE_URL value: - _default: "http://mailer-service.generic:8000" + _default: "http://mailer-service.mailer:8000" - name: CDE_API_MAILER_FROM_EMAIL value: _default: "noreply@sarex.io" diff --git a/apps/documentations/brusnika-stage/kustomization.yaml b/apps/documentations/brusnika-stage/kustomization.yaml index d96ba1d..60d71b8 100644 --- a/apps/documentations/brusnika-stage/kustomization.yaml +++ b/apps/documentations/brusnika-stage/kustomization.yaml @@ -17,3 +17,4 @@ resources: - cde-api-worker-s32d-handle-error.yaml - cde-api-worker-copy.yaml - cde-api-worker-move.yaml + - outbox-relay.yaml diff --git a/apps/documentations/brusnika-stage/outbox-relay.yaml b/apps/documentations/brusnika-stage/outbox-relay.yaml new file mode 100644 index 0000000..a827094 --- /dev/null +++ b/apps/documentations/brusnika-stage/outbox-relay.yaml @@ -0,0 +1,130 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: outbox-relay + namespace: documentations +spec: + interval: 10m + chart: + spec: + chart: universal-chart + version: "0.1.7" + sourceRef: + kind: HelmRepository + name: yc-oci-charts + namespace: flux-system + interval: 10m + install: + remediation: + retries: 3 + upgrade: + remediation: + retries: 3 + values: + global: + env: _default + services: + outbox-relay: + enabled: true + deployment: + enabled: true + name: + _default: outbox-relay + replicaCount: + _default: 1 + revisionHistoryLimit: + _default: 5 + resources: + requests: + cpu: + _default: 100m + memory: + _default: 128Mi + image: + name: + _default: cr.yandex/crp3ccidau046kdj8g9q/outbox-relay:stage_bee3b2a + pullPolicy: + _default: IfNotPresent + service: + enabled: false + imagePullSecrets: + enabled: + _default: true + name: + _default: regcred + envs: + - name: OUTBOX_RELAY_APP_NAME + value: + _default: "cde-api-outbox-relay" + - name: OUTBOX_RELAY_APP_VERSION + value: + _default: "0.1.0" + - name: OUTBOX_RELAY_LOG_LEVEL + value: + _default: "info" + - name: OUTBOX_RELAY_SOURCE_SERVICE + value: + _default: "cde-api" + - name: OUTBOX_RELAY_SOURCE_VERSION + value: + _default: "0.1.0" + - name: OUTBOX_RELAY_PG__SSLMODE + value: + _default: "disable" + - name: OUTBOX_RELAY_PG__POOL_MIN + value: + _default: "1" + - name: OUTBOX_RELAY_PG__POOL_MAX + value: + _default: "3" + - name: OUTBOX_RELAY_PG__TABLE + value: + _default: "outbox" + - name: OUTBOX_RELAY_PG__HOST + value: + _default: "192.168.2.45" + - name: OUTBOX_RELAY_PG__PORT + value: + _default: "5432" + - name: OUTBOX_RELAY_PG__NAME + value: + _default: "documentations" + - name: OUTBOX_RELAY_POLL_INTERVAL + value: + _default: "500ms" + - name: OUTBOX_RELAY_BATCH_SIZE + value: + _default: "100" + - name: OUTBOX_RELAY_MAX_ATTEMPTS + value: + _default: "8" + - name: OUTBOX_RELAY_INITIAL_BACKOFF + value: + _default: "1s" + - name: OUTBOX_RELAY_MAX_BACKOFF + value: + _default: "5m" + - name: OUTBOX_RELAY_SHUTDOWN_TIMEOUT + value: + _default: "30s" + - name: OUTBOX_RELAY_KAFKA__BROKERS + value: + _default: "brusnika-stage-kafka-bootstrap.kafka.svc.cluster.local:9093" + - name: OUTBOX_RELAY_KAFKA__SECURITY_PROTOCOL + value: + _default: "SSL" + - name: OUTBOX_RELAY_KAFKA__INSECURE_SKIP_VERIFY + value: + _default: "true" + secretEnvs: + - name: OUTBOX_RELAY_PG__USER + secretName: + _default: "postgres-secret" + secretKey: + _default: "username" + - name: OUTBOX_RELAY_PG__PASSWORD + secretName: + _default: "postgres-secret" + secretKey: + _default: "password" diff --git a/apps/documentations/cde-api.CONFIGURATION.md b/apps/documentations/cde-api.CONFIGURATION.md index f6057a0..e32f629 100644 --- a/apps/documentations/cde-api.CONFIGURATION.md +++ b/apps/documentations/cde-api.CONFIGURATION.md @@ -22,7 +22,7 @@ - Только переменные окружения с префиксом `CDE_API_`; вложенные секции задаются через `__` (`CDE_API_DATABASE__HOST`). - Несекретные значения — `envs` в HelmRelease. Секреты: в vault-контурах (`base`, а значит `sarex-contour`, `yc-k8s-test`, `d8-ugmk-prod`, `uralkal`, `vad`) — Vault Agent Injector (файлы в `/vault/secrets/`, которые `command: /bin/sh -ec` загружает в окружение перед `exec /opt/main` / `exec /opt/worker`, как у `documentations-api`); в остальных (`ugok`, `brusnika-*`, `wb`) — k8s `secretEnvs`. -- Для Vault-схемы в образы cde-api добавлен статический busybox (`/bin/sh`, `/bin/cat`) — см. `.docker/*/Dockerfile` в репозитории cde-api; без него контейнер не стартует. +- Образы cde-api содержат `/bin/sh` (статический busybox): он нужен для Vault-обёртки запуска (`exec /opt/main` / `exec /opt/worker`). - **Postgres, Valkey и S3 — общие с documentations** (отдельных ресурсов у cde-api нет): БД и креды те же, что у `documentations-api`; Valkey — внутрикластерный `redis:6379` (ns `documentations`, без TLS и пароля, DB 5); S3 — доступ MinIO из `secrets/data/minio/apps/documentations`. - Файл `/etc/app/tasks_execution_config.json` (`CDE_API_WORKFLOWS_CONFIG_FILEPATH`) монтируется из ConfigMap `tasks-execution-config-documentation-v2` (`tasks-execution-config.yaml`; содержимое — `cde-api/.example.tasks_execution_config.json`, в реальных контурах заменить боевыми ресурсами задач). - Значения по умолчанию в `values.yaml` источника — для stage; в iac всегда `global.env=_default`, поэтому здесь взяты prod-значения, а URL зависимостей — по конвенции соответствующего контура (из его `api.yaml`). @@ -89,12 +89,12 @@ Postgres — тот же хост/БД, что у `documentations-api` конт | `CDE_API_DATABASE_HEALTH_CHECK_PERIOD` | `30s` | все | | `CDE_API_DATABASE_MAX_CONN_IDLE_TIME` | `10m` | все | | `CDE_API_DATABASE_MAX_CONN_LIFETIME` | `30m` | все | -| `CDE_API_DATABASE_OBSERVABILITY_ENABLE` | `true` | api | +| `CDE_API_DATABASE_OBSERVABILITY_ENABLE` | `false` | api | | `CDE_API_DATABASE_POOL_SIZE` | `10` *(различается)* | все | | `CDE_API_DATABASE__INSECURE_SKIP_TLS` | `false` | все | | `CDE_API_DATABASE__SSLMODE` | `disable` | все | | `CDE_API_DIAGNOSTICS_SLOW_OPERATION_THRESHOLD` | `30s` | api | -| `CDE_API_DISK_BUCKET_NAMESPACE` | `documentations-prod` | api | +| `CDE_API_DISK_BUCKET_NAMESPACE` | `documentations` | api | | `CDE_API_DJANGO_HOST` | `http://backend-svc.django.svc.cluster.local:80` | api, process-workflows, copy, move | | `CDE_API_DOCUMENTATION_V2_URL` | `http://backend-api-svc.documentations.svc.cluster.local:80` | api, process-workflows, copy, move | | `CDE_API_EAV_HOST` | `http://backend-svc.eav.svc.cluster.local:80` | все | @@ -121,10 +121,7 @@ Postgres — тот же хост/БД, что у `documentations-api` конт | `CDE_API_MAILER_TIMEOUT_MS` | `10000` | api | | `CDE_API_MOVE_JOB_TIMEOUT_MINUTES` | `30` | move | | `CDE_API_MOVE_WORKER_JOBS` | `""` | move | -| `CDE_API_OBSERVABILITY_ENABLE` | `true` | все | -| `CDE_API_OBSERVABILITY_HOST` | `signoz-otel-collector-external.signoz.svc.cluster.local` | все | -| `CDE_API_OBSERVABILITY_PORT` | `4317` | все | -| `CDE_API_OBSERVABILITY_SERVICE_NAME` | `worker-s32d-create-upload` *(различается)* | create-upload, process-workflows, publish-documents, handle-error, copy, move | +| `CDE_API_OBSERVABILITY_ENABLE` | `false` | все | | `CDE_API_PUBLIC_LINK_HOST` | `https://document-link-srx.wb.ru` | api | | `CDE_API_RABBITMQ__HASHER_EXCHANGE` | `hash.compute` | api, copy, move | | `CDE_API_RABBITMQ__HASHER_ROUTING_KEY` | `hash.compute.normal` | api, copy, move | @@ -157,17 +154,15 @@ Postgres — тот же хост/БД, что у `documentations-api` конт | `CDE_API_S32D_WORKER_PUBLISH_DOCUMENTS_MAX_JOBS` | `2` | publish-documents | | `CDE_API_S32D_WORKER_PUBLISH_DOCUMENTS_TIMEOUT_MIN` | `10` | publish-documents | | `CDE_API_S3_BUCKET_LOOKUP` | `auto` | все | -| `CDE_API_S3_BUCKET_NAME` | `documentations-prod` | все | +| `CDE_API_S3_BUCKET_NAME` | `documentations` | все | | `CDE_API_S3_CHECK_BUCKET` | `false` | все | | `CDE_API_S3_CONNECT_TIMEOUT` | `10s` | api | -| `CDE_API_S3_INSECURE_SKIP_TLS` | `true` | все | +| `CDE_API_S3_INSECURE_SKIP_TLS` | `false` | все | | `CDE_API_S3_MAX_PART_SIZE` | `524288000` | все | | `CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE` | `5368709120` | все | | `CDE_API_S3_TLS_HANDSHAKE_TIMEOUT` | `10s` | api | | `CDE_API_S3_UPLOAD_STALL_TIMEOUT` | `10m` | все | | `CDE_API_S3_USE_SSL` | `true` | все | -| `CDE_API_SENTRY_DSN` | `""` | все | -| `CDE_API_SENTRY_ENVIRONMENT` | `""` | все | | `CDE_API_SYSTEMLOG_BASE_URL` | `http://backend-svc.system-log.svc.cluster.local:80` | api, publish-documents, copy, move | | `CDE_API_SYSTEMLOG_TIMEOUT_MS` | `10000` | api, publish-documents, copy, move | | `CDE_API_TRANSMITTALS_URL` | `http://transmittal-service.transmittal.svc.cluster.local:80` | все | @@ -213,24 +208,48 @@ Postgres — тот же хост/БД, что у `documentations-api` конт | Контур | Тип оверлея | Что отличается | | --- | --- | --- | | `sarex-contour`, `yc-k8s-test` | наследуют `base` | ничего (значения `base`) | -| `d8-ugmk-prod`, `uralkal`, `vad` | патч `cde-api.yaml` поверх `base` | `CDE_API_PUBLIC_LINK_HOST` | +| `d8-ugmk-prod`, `uralkal`, `vad` | патчи на все 7 HelmRelease (`cde-api*.yaml`, список `envs` заменяется целиком) поверх `base` | `CDE_API_PUBLIC_LINK_HOST` (только api), TLS к S3 (см. ниже) | | `ugok` | полная копия HelmRelease, chart 0.1.9 | URL зависимостей (порты 8000/8080), образы из `10.4.10.187:80/library`, pull-secret `dockerhub` | | `brusnika-prod`, `brusnika-stage` | полная копия, chart 0.1.7 | URL зависимостей; stage — профиль stage (`CDE_API_ENVIRONMENT=stage`, bucket `documentations-stage`) | | `wb` | полная копия, chart 0.1.7 | URL зависимостей, `CDE_API_PUBLIC_LINK_HOST=https://document-link-srx.wb.ru` | Правка `base` на полные копии (ugok, brusnika-*, wb) не влияет. +## SSL / TLS по контурам + +В исходном `values.yaml` cde-api все соединения с TLS (Postgres `verify-full`, Valkey SSL, S3 SSL с пропуском проверки). В iac соседние сервисы работают иначе, поэтому значения выставлены по контуру: + +| Соединение | Переменные | Значение в iac | Почему | +| --- | --- | --- | --- | +| Postgres | `CDE_API_DATABASE__SSLMODE` | `disable` везде | у `documentations-api`/pdf-markings во всех контурах `sslmode=disable`; CA-сертификат (`CERT_BASE64`) не передаётся | +| Valkey | `CDE_API_REDIS__SSL` | `false` везде | внутрикластерный `redis:6379` без TLS | +| RabbitMQ | `CDE_API_RABBITMQ__SSL` | не задана (по умолчанию `false`) | порт `5672`, как у marks/hasher | +| S3 | `CDE_API_S3_USE_SSL` / `CDE_API_S3_INSECURE_SKIP_TLS` | см. таблицу ниже | повторяют флаги pdf-markings / hasher, которые ходят в тот же S3-секрет | +| Kafka (outbox-relay) | `KAFKA__SECURITY_PROTOCOL`, `KAFKA__INSECURE_SKIP_VERIFY` | `SASL_SSL` (base) / `SSL` (Strimzi-контуры), `INSECURE_SKIP_VERIFY=true`, CA не нужен | как у pm; см. outbox-relay.CONFIGURATION.md | + +S3 по контурам (`USE_SSL` / `INSECURE_SKIP_TLS`): + +| Контур | USE_SSL | INSECURE_SKIP_TLS | Источник значения | +| --- | --- | --- | --- | +| `base` (`sarex-contour`, `yc-k8s-test`) | `true` | `false` | `MARKS_S3__USE_SSL=true`, `SSL_VERIFY=true` в base | +| `d8-ugmk-prod` | `true` | `true` | pdf-markings: `USE_SSL=true`, `SSL_VERIFY=false` | +| `uralkal`, `vad` | `false` | `false` | pdf-markings: `USE_SSL=false` | +| `ugok` | `false` | `false` | `YANDEX_S3_USE_SSL=0` | +| `brusnika-prod` | `true` | `false` | hasher: `USE_SSL=true`, `VERIFY=true` (тот же `hasher-s3-secret`) | +| `brusnika-stage` | `false` | `false` | pdf-markings (тот же `yc-s3`): `USE_SSL=false`; hasher там `true` — проверить | +| `wb` | `false` | `false` | pdf-markings: `USE_SSL=false` | + +Эндпоинт S3 приходит из секрета (`endpoint`); если он содержит схему `https://`/`http://`, она должна совпадать с `USE_SSL`. + ## Допущения и что нужно проверить -- **Теги образов** (`prod_c9bc246`; у brusnika-stage `stage_c9bc246`, у ugok `ugok_c9bc246`) — placeholder на основе HEAD ветки develop cde-api; заменить на фактически собранные CI. -- `CDE_API_DJANGO_HOST` и `CDE_API_USERS_BASE_URL` в источнике — внешний хост (`https://lk.sarex.io`), здесь заменены внутренним адресом Django контура. Если cde-api использует их для внешних ссылок — вернуть внешний хост. -- `CDE_API_S3_BUCKET_NAME` для prod-контуров выставлен в `documentations-prod` по аналогии с `CDE_API_DISK_BUCKET_NAMESPACE`; в источнике задан только stage-бакет. +- `CDE_API_DJANGO_HOST` и `CDE_API_USERS_BASE_URL` повторяют `DJANGO_HOST` из `api.yaml` контура (внутренний адрес Django, не внешний хост из исходного `values.yaml`); documentations использует один и тот же адрес и для получения пользователей. +- `CDE_API_DISK_BUCKET_NAMESPACE=documentations` — как `NAMESPACE` у documentations-api во всех контурах (в коде cde-api это префикс бакетов компаний `--`, совместимый с legacy doc-api). `CDE_API_S3_BUCKET_NAME=documentations` — только запасной бакет клиента S3 (`CHECK_BUCKET=false`), у documentations-api такой настройки нет. - `CDE_API_EAV_HOST`, `CDE_API_TRANSMITTALS_URL` выбраны по конвенции остальных приложений контура (`backend-svc.eav`, `eav-service.eav`, `transmittal-service.transmittal`); сверить с `inventory.yaml`. -- Sentry отключён (`CDE_API_SENTRY_DSN=""`): DSN источника ведёт во внешний SaaS. -- Реплики воркеров `create-upload` и `process-workflows` — `1` (в prod-конфиге cde-api — `0`). +- **Sentry и SigNoz отключены:** переменные `CDE_API_SENTRY_*` и `CDE_API_OBSERVABILITY_{HOST,PORT,SERVICE_NAME,INSECURE}` удалены, `CDE_API_OBSERVABILITY_ENABLE=false`, `CDE_API_DATABASE_OBSERVABILITY_ENABLE=false`. +- Реплики всех процессов (api и воркеры) — `1` (в исходном prod-конфиге cde-api у `create-upload` и `process-workflows` было `0`). - Порт: в источнике `deployment.port=8080` при `CDE_API_HTTP_PORT=8000` и `service.targetPort=8000`; здесь везде 8000. - Общая с documentations БД: cde-api применяет свои миграции в той же базе — проверить отсутствие конфликтов имён таблиц/схемы и версий миграций (отдельная схема или префикс при необходимости). - Общий Valkey без пароля и TLS (в источнике cde-api — управляемый Valkey с TLS и логином): подтвердить, что cde-api работает без `CDE_API_REDIS__USERNAME/PASSWORD`. DB 5 совпадает с `VALKEY_DB=5` у documentations-api (в stage так же). - `secrets/data/apps/cde-api/zeebe` в Vault нужно создать; в k8s-контурах нужен только Secret `cde-api-zeebe-secret`; S3 и RabbitMQ используют существующие Secret'ы hasher / pdf-markings / api (таблица выше). Если в Secret'ах S3 другие права или бакет, чем нужны cde-api, заменить на отдельный. - Значения секретов из Vault подставляются в окружение через `. file` без кавычек — как у `documentations-api`; пароли со спецсимволами shell ломают этот способ. -- Образы cde-api нужно пересобрать с добавленным busybox (проверка сборки Docker не выполнялась); без этого поды в vault-контурах не стартуют. diff --git a/apps/documentations/cde-api.ENDPOINTS.md b/apps/documentations/cde-api.ENDPOINTS.md index 1db478c..ac127e4 100644 --- a/apps/documentations/cde-api.ENDPOINTS.md +++ b/apps/documentations/cde-api.ENDPOINTS.md @@ -34,7 +34,6 @@ | S3 | Vault `secrets/data/minio/apps/documentations` (k8s-контуры: существующие Secret'ы контура, см. CONFIGURATION), бакет `CDE_API_S3_BUCKET_NAME` | хранение и multipart-загрузка файлов дисков | | Zeebe (Camunda) | Vault `secrets/data/apps/cde-api/zeebe` (k8s-контуры: `cde-api-zeebe-secret`) | S32D-воркеры берут задачи из Zeebe | | RabbitMQ | Vault `secrets/data/rabbitmq/apps/cde` (k8s-контуры: существующие Secret'ы контура), хост `rabbitmq.rabbitmq.svc.cluster.local:5672`; ключи `pdf_markings_input`, `hash.compute.normal`, обмен `hash.compute` | постановка задач на штампы (pdf-markings) и хэширование (hasher) | -| SigNoz OTLP | `CDE_API_OBSERVABILITY_HOST:4317` (`signoz-otel-collector-external.signoz`) | трейсы и метрики | | Контейнерный реестр / workflows | `CDE_API_CONTAINER_REGISTRY`, `CDE_API_WORKFLOWS_IMAGES_VERSION=master`, файл `tasks_execution_config.json` | запуск задач обработки (k8s-jobs) | ## Входящий трафик diff --git a/apps/documentations/cde-api.env.example b/apps/documentations/cde-api.env.example index 0472444..e55f406 100644 --- a/apps/documentations/cde-api.env.example +++ b/apps/documentations/cde-api.env.example @@ -8,17 +8,13 @@ CDE_API_RESOURCES_BASE_URL=http://iams.iam.svc.cluster.local:8080 CDE_API_RESOURCES_TIMEOUT=10s CDE_API_APP_NAME=cde-api -CDE_API_SENTRY_DSN= -CDE_API_SENTRY_ENVIRONMENT= CDE_API_LOG_LEVEL=debug CDE_API_HTTP_PORT=8000 CDE_API_HTTP_READ_TIMEOUT=0s CDE_API_HTTP_WRITE_TIMEOUT=0s CDE_API_HTTP_IDLE_TIMEOUT=120s CDE_API_HTTP_READ_BUFFER_SIZE=96 -CDE_API_OBSERVABILITY_ENABLE=true -CDE_API_OBSERVABILITY_HOST=signoz-otel-collector-external.signoz.svc.cluster.local -CDE_API_OBSERVABILITY_PORT=4317 +CDE_API_OBSERVABILITY_ENABLE=false CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE=5368709120 CDE_API_S3_MAX_PART_SIZE=524288000 CDE_API_S3_UPLOAD_STALL_TIMEOUT=10m @@ -63,7 +59,7 @@ CDE_API_DATABASE_POOL_SIZE=10 CDE_API_DIAGNOSTICS_SLOW_OPERATION_THRESHOLD=30s CDE_API_DATABASE__SSLMODE=disable CDE_API_DATABASE__INSECURE_SKIP_TLS=false -CDE_API_DATABASE_OBSERVABILITY_ENABLE=true +CDE_API_DATABASE_OBSERVABILITY_ENABLE=false CDE_API_REDIS__DB=5 CDE_API_REDIS__SSL=false CDE_API_REDIS__POOL_SIZE=10 @@ -73,10 +69,10 @@ CDE_API_REDIS__READ_TIMEOUT_MS=3000 CDE_API_REDIS__WRITE_TIMEOUT_MS=3000 CDE_API_REDIS__DEFAULT_TTL_MINUTES=10 CDE_API_REDIS__PERMISSION_CACHE_ENABLED=false -CDE_API_S3_BUCKET_NAME=documentations-prod +CDE_API_S3_BUCKET_NAME=documentations CDE_API_S3_USE_SSL=true CDE_API_S3_BUCKET_LOOKUP=auto -CDE_API_S3_INSECURE_SKIP_TLS=true +CDE_API_S3_INSECURE_SKIP_TLS=false CDE_API_S3_CHECK_BUCKET=false CDE_API_S3_CONNECT_TIMEOUT=10s CDE_API_S3_TLS_HANDSHAKE_TIMEOUT=10s @@ -84,7 +80,7 @@ CDE_API_S32D_MAX_ARCHIVE_SIZE_BYTES=1099511627776 CDE_API_S32D_MAX_FILES_COUNT=500 CDE_API_ZEEBE_USE_PLAINTEXT=true CDE_API_USERS_BASE_URL=http://backend-svc.django.svc.cluster.local:80 -CDE_API_DISK_BUCKET_NAMESPACE=documentations-prod +CDE_API_DISK_BUCKET_NAMESPACE=documentations CDE_API_USERS_ORIGINATOR=docs_prod CDE_API_USERS_TIMEOUT_MS=10000 CDE_API_MAILER_BASE_URL=http://mailer-service.mailer:8000 diff --git a/apps/documentations/d8-ugmk-prod/cde-api-worker-copy.yaml b/apps/documentations/d8-ugmk-prod/cde-api-worker-copy.yaml new file mode 100644 index 0000000..8fb4cc3 --- /dev/null +++ b/apps/documentations/d8-ugmk-prod/cde-api-worker-copy.yaml @@ -0,0 +1,236 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-copy + namespace: documentations +spec: + values: + services: + worker-copy: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-copy" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_SYSTEMLOG_BASE_URL + value: + _default: "http://backend-svc.system-log.svc.cluster.local:80" + - name: CDE_API_SYSTEMLOG_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "true" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "true" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_WORKFLOW_BASE_URL + value: + _default: "http://backend-svc.processing.svc.cluster.local:80" + - name: CDE_API_WORKFLOW_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKFLOW_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_V2_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_BIMAPI_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_TIMEOUT_V2_MS + value: + _default: "300000" + - name: CDE_API_CONTAINER_REGISTRY + value: + _default: "cr.yandex/crp3ccidau046kdj8g9q" + - name: CDE_API_WORKFLOWS_IMAGES_VERSION + value: + _default: "master" + - name: CDE_API_DJANGO_HOST + value: + _default: "http://backend-svc.django.svc.cluster.local:80" + - name: CDE_API_ENVIRONMENT + value: + _default: "production" + - name: CDE_API_CONVERTED_PDF_TO_S3 + value: + _default: "true" + - name: CDE_API_CONVERT_DXF_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_CONVERT_DWG_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_USE_BIMV1_FOR_BIMV2 + value: + _default: "true" + - name: CDE_API_LAST_MASTER_BIM + value: + _default: "36311" + - name: CDE_API_LAST_SLAVE_1_BIM + value: + _default: "94015" + - name: CDE_API_LAST_SLAVE_2_BIM + value: + _default: "135771" + - name: CDE_API_USE_BIM_INSERTER + value: + _default: "true" + - name: CDE_API_USE_LEGACY_BIM_FLOW + value: + _default: "0" + - name: CDE_API_DOCUMENTATION_V2_URL + value: + _default: "http://backend-api-svc.documentations.svc.cluster.local:80" + - name: CDE_API_INTERNAL_URL + value: + _default: "http://cde-api.documentations:8000" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_WORKSPACE_BASE_URL + value: + _default: "http://backend-svc.workspaces.svc.cluster.local:80" + - name: CDE_API_WORKSPACE_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKSPACE_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_RABBITMQ__MARKS_ROUTING_KEY + value: + _default: "pdf_markings_input" + - name: CDE_API_RABBITMQ__HASHER_ROUTING_KEY + value: + _default: "hash.compute.normal" + - name: CDE_API_RABBITMQ__HASHER_EXCHANGE + value: + _default: "hash.compute" + - name: CDE_API_ISSUES_SYNC_ENABLED + value: + _default: "false" + - name: CDE_API_ISSUES_BASE_URL + value: + _default: "http://issues-service.platform:8000" + - name: CDE_API_ISSUES_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_ISSUES_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_COPY_WORKER_JOBS + value: + _default: "" + - name: CDE_API_COPY_JOB_TIMEOUT_MINUTES + value: + _default: "30" + - name: CDE_API_COPY_STEP_PARALLELISM + value: + _default: "1" + - name: CDE_API_COPY_S3_PARALLELISM + value: + _default: "1" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" + - name: CDE_API_RABBITMQ__HOST + value: + _default: "rabbitmq.rabbitmq.svc.cluster.local" + - name: CDE_API_RABBITMQ__PORT + value: + _default: "5672" diff --git a/apps/documentations/d8-ugmk-prod/cde-api-worker-move.yaml b/apps/documentations/d8-ugmk-prod/cde-api-worker-move.yaml new file mode 100644 index 0000000..ffb9d10 --- /dev/null +++ b/apps/documentations/d8-ugmk-prod/cde-api-worker-move.yaml @@ -0,0 +1,218 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-move + namespace: documentations +spec: + values: + services: + worker-move: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-move" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_SYSTEMLOG_BASE_URL + value: + _default: "http://backend-svc.system-log.svc.cluster.local:80" + - name: CDE_API_SYSTEMLOG_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "10" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "true" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "true" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_WORKFLOW_BASE_URL + value: + _default: "http://backend-svc.processing.svc.cluster.local:80" + - name: CDE_API_WORKFLOW_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKFLOW_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_V2_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_BIMAPI_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_TIMEOUT_V2_MS + value: + _default: "300000" + - name: CDE_API_CONTAINER_REGISTRY + value: + _default: "cr.yandex/crp3ccidau046kdj8g9q" + - name: CDE_API_WORKFLOWS_IMAGES_VERSION + value: + _default: "master" + - name: CDE_API_DJANGO_HOST + value: + _default: "http://backend-svc.django.svc.cluster.local:80" + - name: CDE_API_ENVIRONMENT + value: + _default: "production" + - name: CDE_API_CONVERTED_PDF_TO_S3 + value: + _default: "true" + - name: CDE_API_CONVERT_DXF_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_CONVERT_DWG_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_USE_BIMV1_FOR_BIMV2 + value: + _default: "true" + - name: CDE_API_LAST_MASTER_BIM + value: + _default: "36311" + - name: CDE_API_LAST_SLAVE_1_BIM + value: + _default: "94015" + - name: CDE_API_LAST_SLAVE_2_BIM + value: + _default: "135771" + - name: CDE_API_USE_BIM_INSERTER + value: + _default: "true" + - name: CDE_API_USE_LEGACY_BIM_FLOW + value: + _default: "0" + - name: CDE_API_DOCUMENTATION_V2_URL + value: + _default: "http://backend-api-svc.documentations.svc.cluster.local:80" + - name: CDE_API_INTERNAL_URL + value: + _default: "http://cde-api.documentations:8000" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_WORKSPACE_BASE_URL + value: + _default: "http://backend-svc.workspaces.svc.cluster.local:80" + - name: CDE_API_WORKSPACE_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKSPACE_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_RABBITMQ__MARKS_ROUTING_KEY + value: + _default: "pdf_markings_input" + - name: CDE_API_RABBITMQ__HASHER_ROUTING_KEY + value: + _default: "hash.compute.normal" + - name: CDE_API_RABBITMQ__HASHER_EXCHANGE + value: + _default: "hash.compute" + - name: CDE_API_MOVE_WORKER_JOBS + value: + _default: "" + - name: CDE_API_MOVE_JOB_TIMEOUT_MINUTES + value: + _default: "30" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" + - name: CDE_API_RABBITMQ__HOST + value: + _default: "rabbitmq.rabbitmq.svc.cluster.local" + - name: CDE_API_RABBITMQ__PORT + value: + _default: "5672" diff --git a/apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-create-upload.yaml b/apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-create-upload.yaml new file mode 100644 index 0000000..e01affb --- /dev/null +++ b/apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-create-upload.yaml @@ -0,0 +1,125 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-s32d-create-upload + namespace: documentations +spec: + values: + services: + worker-s32d-create-upload: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-s32d-create-upload" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "true" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "true" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_S32D_READERAT_BLOCK_SIZE_MB + value: + _default: "8" + - name: CDE_API_S32D_READERAT_CACHE_BLOCKS + value: + _default: "8" + - name: CDE_API_S32D_WORKER_CREATE_UPLOAD_TIMEOUT_MIN + value: + _default: "240" + - name: CDE_API_S32D_WORKER_CREATE_UPLOAD_MAX_JOBS + value: + _default: "2" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" diff --git a/apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-handle-error.yaml b/apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-handle-error.yaml new file mode 100644 index 0000000..8171ee5 --- /dev/null +++ b/apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-handle-error.yaml @@ -0,0 +1,119 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-s32d-handle-error + namespace: documentations +spec: + values: + services: + worker-s32d-handle-error: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-s32d-handle-error" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "2" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "true" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "true" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_S32D_WORKER_HANDLE_ERROR_TIMEOUT_MIN + value: + _default: "10" + - name: CDE_API_S32D_WORKER_HANDLE_ERROR_MAX_JOBS + value: + _default: "4" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" diff --git a/apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-process-workflows.yaml b/apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-process-workflows.yaml new file mode 100644 index 0000000..17b9b7c --- /dev/null +++ b/apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-process-workflows.yaml @@ -0,0 +1,188 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-s32d-process-workflows + namespace: documentations +spec: + values: + services: + worker-s32d-process-workflows: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-s32d-process-workflows" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "true" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "true" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_S32D_WORKER_PROCESS_WORKFLOWS_TIMEOUT_MIN + value: + _default: "480" + - name: CDE_API_S32D_WORKER_PROCESS_WORKFLOWS_MAX_JOBS + value: + _default: "2" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_WORKFLOW_BASE_URL + value: + _default: "http://backend-svc.processing.svc.cluster.local:80" + - name: CDE_API_WORKFLOW_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKFLOW_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_V2_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_BIMAPI_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_TIMEOUT_V2_MS + value: + _default: "300000" + - name: CDE_API_CONTAINER_REGISTRY + value: + _default: "cr.yandex/crp3ccidau046kdj8g9q" + - name: CDE_API_WORKFLOWS_IMAGES_VERSION + value: + _default: "master" + - name: CDE_API_DJANGO_HOST + value: + _default: "http://backend-svc.django.svc.cluster.local:80" + - name: CDE_API_ENVIRONMENT + value: + _default: "production" + - name: CDE_API_CONVERTED_PDF_TO_S3 + value: + _default: "true" + - name: CDE_API_CONVERT_DXF_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_CONVERT_DWG_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_USE_BIMV1_FOR_BIMV2 + value: + _default: "true" + - name: CDE_API_LAST_MASTER_BIM + value: + _default: "36311" + - name: CDE_API_LAST_SLAVE_1_BIM + value: + _default: "94015" + - name: CDE_API_LAST_SLAVE_2_BIM + value: + _default: "135771" + - name: CDE_API_USE_BIM_INSERTER + value: + _default: "true" + - name: CDE_API_USE_LEGACY_BIM_FLOW + value: + _default: "0" + - name: CDE_API_DOCUMENTATION_V2_URL + value: + _default: "http://backend-api-svc.documentations.svc.cluster.local:80" + - name: CDE_API_INTERNAL_URL + value: + _default: "http://cde-api.documentations:8000" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" diff --git a/apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-publish-documents.yaml b/apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-publish-documents.yaml new file mode 100644 index 0000000..0007b09 --- /dev/null +++ b/apps/documentations/d8-ugmk-prod/cde-api-worker-s32d-publish-documents.yaml @@ -0,0 +1,134 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-s32d-publish-documents + namespace: documentations +spec: + values: + services: + worker-s32d-publish-documents: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-s32d-publish-documents" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "true" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "true" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_S32D_WORKER_PUBLISH_DOCUMENTS_TIMEOUT_MIN + value: + _default: "10" + - name: CDE_API_S32D_WORKER_PUBLISH_DOCUMENTS_MAX_JOBS + value: + _default: "2" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_SYSTEMLOG_BASE_URL + value: + _default: "http://backend-svc.system-log.svc.cluster.local:80" + - name: CDE_API_SYSTEMLOG_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKSPACE_BASE_URL + value: + _default: "http://backend-svc.workspaces.svc.cluster.local:80" + - name: CDE_API_WORKSPACE_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKSPACE_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" diff --git a/apps/documentations/d8-ugmk-prod/cde-api.yaml b/apps/documentations/d8-ugmk-prod/cde-api.yaml index 06e1e24..d2dab55 100644 --- a/apps/documentations/d8-ugmk-prod/cde-api.yaml +++ b/apps/documentations/d8-ugmk-prod/cde-api.yaml @@ -18,12 +18,6 @@ spec: - name: CDE_API_APP_NAME value: _default: "cde-api" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "debug" @@ -44,13 +38,7 @@ spec: _default: "96" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -185,7 +173,7 @@ spec: _default: "false" - name: CDE_API_DATABASE_OBSERVABILITY_ENABLE value: - _default: "true" + _default: "false" - name: CDE_API_REDIS__DB value: _default: "5" @@ -215,7 +203,7 @@ spec: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_S3_USE_SSL value: _default: "true" @@ -248,7 +236,7 @@ spec: _default: "http://backend-svc.django.svc.cluster.local:80" - name: CDE_API_DISK_BUCKET_NAMESPACE value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_USERS_ORIGINATOR value: _default: "docs_prod" diff --git a/apps/documentations/d8-ugmk-prod/kustomization.yaml b/apps/documentations/d8-ugmk-prod/kustomization.yaml index 4ec96db..59e6e8c 100644 --- a/apps/documentations/d8-ugmk-prod/kustomization.yaml +++ b/apps/documentations/d8-ugmk-prod/kustomization.yaml @@ -20,4 +20,28 @@ patches: - path: cde-api.yaml target: kind: HelmRelease - name: cde-api \ No newline at end of file + name: cde-api + - path: cde-api-worker-s32d-create-upload.yaml + target: + kind: HelmRelease + name: cde-api-worker-s32d-create-upload + - path: cde-api-worker-s32d-process-workflows.yaml + target: + kind: HelmRelease + name: cde-api-worker-s32d-process-workflows + - path: cde-api-worker-s32d-publish-documents.yaml + target: + kind: HelmRelease + name: cde-api-worker-s32d-publish-documents + - path: cde-api-worker-s32d-handle-error.yaml + target: + kind: HelmRelease + name: cde-api-worker-s32d-handle-error + - path: cde-api-worker-copy.yaml + target: + kind: HelmRelease + name: cde-api-worker-copy + - path: cde-api-worker-move.yaml + target: + kind: HelmRelease + name: cde-api-worker-move diff --git a/apps/documentations/outbox-relay.CONFIGURATION.md b/apps/documentations/outbox-relay.CONFIGURATION.md new file mode 100644 index 0000000..ad2ddb6 --- /dev/null +++ b/apps/documentations/outbox-relay.CONFIGURATION.md @@ -0,0 +1,44 @@ +# Конфигурация outbox-relay + +`outbox-relay` (репозиторий `outbox-relay`, образ `outbox-relay`) — воркер transactional outbox для cde-api: опрашивает таблицу `outbox` в БД cde-api и публикует события в Kafka. HelmRelease `outbox-relay` в ns `documentations`, Service нет, 1 реплика. Манифест — `base/outbox-relay.yaml` и одноимённые файлы в `ugok/`, `brusnika-*/`, `wb/`. + +Миграции не запускает: таблицу `outbox` создаёт cde-api (`migrations/001_create_outbox.sql` из репозитория relay нужно включить в миграции cde-api). БД — **общая с documentations** (как и у cde-api), поэтому таблица `outbox` появляется в БД documentations. + +## Переменные окружения + +Префикс `OUTBOX_RELAY_`, секции через `__`. + +| Переменная | Значение | Комментарий | +| --- | --- | --- | +| `APP_NAME`, `APP_VERSION` | `cde-api-outbox-relay`, `0.1.0` | | +| `SOURCE_SERVICE`, `SOURCE_VERSION` | `cde-api`, `0.1.0` | значения поля source в envelope событий | +| `LOG_LEVEL` | `info` | | +| `PG__SSLMODE` | `disable` | как у cde-api в iac (общий Postgres без TLS) | +| `PG__POOL_MIN` / `PG__POOL_MAX` | `1` / `3` | | +| `PG__TABLE` | `outbox` | | +| `PG__HOST/PORT/NAME/USER/PASSWORD` | Vault `secrets/data/apps/documentations/postgres` (vault-контуры) или литералы + секрет БД контура | та же БД, что у cde-api | +| `POLL_INTERVAL` / `BATCH_SIZE` | `500ms` / `100` | | +| `MAX_ATTEMPTS` / `INITIAL_BACKOFF` / `MAX_BACKOFF` | `8` / `1s` / `5m` | | +| `SHUTDOWN_TIMEOUT` | `30s` | | +| `KAFKA__BROKERS` | см. таблицу ниже | | +| `KAFKA__SECURITY_PROTOCOL` | `SASL_SSL` (vault-контуры) / `SSL` (остальные) | включает TLS; SASL включается, если задан `SASL_USERNAME` | +| `KAFKA__INSECURE_SKIP_VERIFY` | `true` | сертификат брокера не проверяется, CA не нужен; клиентский сертификат (mTLS) relay не поддерживает | +| `KAFKA__SASL_MECHANISM/USERNAME/PASSWORD` | Vault `secrets/data/kafka/apps/documentations` | только vault-контуры | + +В `.helm/values.yaml` репозитория relay используются `KAFKA__HOST/PORT` и секрет `cde-api-kafka-secret`; в iac вместо них — `KAFKA__BROKERS` и адреса Kafka своего контура. + +## Kafka по контурам + +| Контур | Brokers | Протокол | Проверка сертификата | Аутентификация | +| --- | --- | --- | --- | --- | +| `base` (`sarex-contour`, `yc-k8s-test`, `d8-ugmk-prod`, `uralkal`, `vad`) | `kafka-kafka-contour.kafka.svc.cluster.local:9092` | `SASL_SSL` | не проверяется | Vault `secrets/data/kafka/apps/documentations` | +| `wb` | `wb-prod-kafka-bootstrap.kafka.svc.cluster.local:9093` | `SSL` | не проверяется | нет (как у pm) | +| `ugok` | `ugok-prod-kafka-bootstrap.kafka.svc.cluster.local:9093` | `SSL` | не проверяется | нет | +| `brusnika-prod`, `brusnika-stage` | `brusnika-stage-kafka-bootstrap.kafka.svc.cluster.local:9093` | `SSL` | не проверяется | нет | + +## Допущения и что нужно проверить + +- **Vault:** путь `secrets/data/kafka/apps/documentations` (SCRAM-пользователь с правом писать в топики cde-api) нужно создать, роль `documentations` — разрешить его чтение. +- **`brusnika-prod`:** адрес Kafka взят из brusnika-stage (так указано в `bi/brusnika-prod`, у pm в brusnika-prod Kafka не настроена). +- **`sarex-contour`, `yc-k8s-test`:** адрес `kafka-kafka-contour` взят у остальных vault-контуров; сверить с `infrastructure/kafka/<кластер>`. +- Топики событий (39 штук, список — `docs/cde-api-rollout.md`, раздел 5) создаёт команда инфраструктуры до запуска relay. diff --git a/apps/documentations/ugok/cde-api-worker-copy.yaml b/apps/documentations/ugok/cde-api-worker-copy.yaml index 0b1044b..5d16f7f 100644 --- a/apps/documentations/ugok/cde-api-worker-copy.yaml +++ b/apps/documentations/ugok/cde-api-worker-copy.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-copy" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-copy" - name: CDE_API_SYSTEMLOG_BASE_URL value: _default: "http://api-service.system-log.svc.cluster.local:8000" @@ -140,19 +125,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/ugok/cde-api-worker-move.yaml b/apps/documentations/ugok/cde-api-worker-move.yaml index 93c6d03..34230f3 100644 --- a/apps/documentations/ugok/cde-api-worker-move.yaml +++ b/apps/documentations/ugok/cde-api-worker-move.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-move" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-move" - name: CDE_API_SYSTEMLOG_BASE_URL value: _default: "http://api-service.system-log.svc.cluster.local:8000" @@ -140,19 +125,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/ugok/cde-api-worker-s32d-create-upload.yaml b/apps/documentations/ugok/cde-api-worker-s32d-create-upload.yaml index 04411c9..a8eda75 100644 --- a/apps/documentations/ugok/cde-api-worker-s32d-create-upload.yaml +++ b/apps/documentations/ugok/cde-api-worker-s32d-create-upload.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-create-upload" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-create-upload" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -134,19 +119,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/ugok/cde-api-worker-s32d-handle-error.yaml b/apps/documentations/ugok/cde-api-worker-s32d-handle-error.yaml index 8578e44..a188a04 100644 --- a/apps/documentations/ugok/cde-api-worker-s32d-handle-error.yaml +++ b/apps/documentations/ugok/cde-api-worker-s32d-handle-error.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-handle-error" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-handle-error" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -134,19 +119,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/ugok/cde-api-worker-s32d-process-workflows.yaml b/apps/documentations/ugok/cde-api-worker-s32d-process-workflows.yaml index 994208c..389d0e8 100644 --- a/apps/documentations/ugok/cde-api-worker-s32d-process-workflows.yaml +++ b/apps/documentations/ugok/cde-api-worker-s32d-process-workflows.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-process-workflows" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-process-workflows" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -134,19 +119,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/ugok/cde-api-worker-s32d-publish-documents.yaml b/apps/documentations/ugok/cde-api-worker-s32d-publish-documents.yaml index 5b05a83..53eb112 100644 --- a/apps/documentations/ugok/cde-api-worker-s32d-publish-documents.yaml +++ b/apps/documentations/ugok/cde-api-worker-s32d-publish-documents.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-publish-documents" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-publish-documents" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -134,19 +119,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/ugok/cde-api.yaml b/apps/documentations/ugok/cde-api.yaml index 1a33be3..cebe996 100644 --- a/apps/documentations/ugok/cde-api.yaml +++ b/apps/documentations/ugok/cde-api.yaml @@ -75,12 +75,6 @@ spec: - name: CDE_API_APP_NAME value: _default: "cde-api" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "debug" @@ -101,13 +95,7 @@ spec: _default: "96" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -242,7 +230,7 @@ spec: _default: "false" - name: CDE_API_DATABASE_OBSERVABILITY_ENABLE value: - _default: "true" + _default: "false" - name: CDE_API_REDIS__DB value: _default: "5" @@ -272,16 +260,16 @@ spec: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" @@ -305,7 +293,7 @@ spec: _default: "http://backend.django.svc.cluster.local:8000" - name: CDE_API_DISK_BUCKET_NAMESPACE value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_USERS_ORIGINATOR value: _default: "docs_prod" diff --git a/apps/documentations/ugok/kustomization.yaml b/apps/documentations/ugok/kustomization.yaml index b40c08a..2246ab6 100644 --- a/apps/documentations/ugok/kustomization.yaml +++ b/apps/documentations/ugok/kustomization.yaml @@ -21,3 +21,4 @@ resources: - cde-api-worker-s32d-handle-error.yaml - cde-api-worker-copy.yaml - cde-api-worker-move.yaml + - outbox-relay.yaml diff --git a/apps/documentations/ugok/outbox-relay.yaml b/apps/documentations/ugok/outbox-relay.yaml new file mode 100644 index 0000000..57ef271 --- /dev/null +++ b/apps/documentations/ugok/outbox-relay.yaml @@ -0,0 +1,130 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: outbox-relay + namespace: documentations +spec: + interval: 10m + chart: + spec: + chart: universal-chart + version: "0.1.9" + sourceRef: + kind: HelmRepository + name: yc-oci-charts + namespace: flux-system + interval: 10m + install: + remediation: + retries: 3 + upgrade: + remediation: + retries: 3 + values: + global: + env: _default + services: + outbox-relay: + enabled: true + deployment: + enabled: true + name: + _default: outbox-relay + replicaCount: + _default: 1 + revisionHistoryLimit: + _default: 5 + resources: + requests: + cpu: + _default: 100m + memory: + _default: 128Mi + image: + name: + _default: 10.4.10.187:80/library/outbox-relay:ugok_bee3b2a + pullPolicy: + _default: IfNotPresent + service: + enabled: false + imagePullSecrets: + enabled: + _default: true + name: + _default: dockerhub + envs: + - name: OUTBOX_RELAY_APP_NAME + value: + _default: "cde-api-outbox-relay" + - name: OUTBOX_RELAY_APP_VERSION + value: + _default: "0.1.0" + - name: OUTBOX_RELAY_LOG_LEVEL + value: + _default: "info" + - name: OUTBOX_RELAY_SOURCE_SERVICE + value: + _default: "cde-api" + - name: OUTBOX_RELAY_SOURCE_VERSION + value: + _default: "0.1.0" + - name: OUTBOX_RELAY_PG__SSLMODE + value: + _default: "disable" + - name: OUTBOX_RELAY_PG__POOL_MIN + value: + _default: "1" + - name: OUTBOX_RELAY_PG__POOL_MAX + value: + _default: "3" + - name: OUTBOX_RELAY_PG__TABLE + value: + _default: "outbox" + - name: OUTBOX_RELAY_PG__HOST + value: + _default: "postgres-service" + - name: OUTBOX_RELAY_PG__PORT + value: + _default: "5432" + - name: OUTBOX_RELAY_PG__NAME + value: + _default: "documentations_db" + - name: OUTBOX_RELAY_POLL_INTERVAL + value: + _default: "500ms" + - name: OUTBOX_RELAY_BATCH_SIZE + value: + _default: "100" + - name: OUTBOX_RELAY_MAX_ATTEMPTS + value: + _default: "8" + - name: OUTBOX_RELAY_INITIAL_BACKOFF + value: + _default: "1s" + - name: OUTBOX_RELAY_MAX_BACKOFF + value: + _default: "5m" + - name: OUTBOX_RELAY_SHUTDOWN_TIMEOUT + value: + _default: "30s" + - name: OUTBOX_RELAY_KAFKA__BROKERS + value: + _default: "ugok-prod-kafka-bootstrap.kafka.svc.cluster.local:9093" + - name: OUTBOX_RELAY_KAFKA__SECURITY_PROTOCOL + value: + _default: "SSL" + - name: OUTBOX_RELAY_KAFKA__INSECURE_SKIP_VERIFY + value: + _default: "true" + secretEnvs: + - name: OUTBOX_RELAY_PG__USER + secretName: + _default: "documentations-postgresql-secret" + secretKey: + _default: "username" + - name: OUTBOX_RELAY_PG__PASSWORD + secretName: + _default: "documentations-postgresql-secret" + secretKey: + _default: "password" diff --git a/apps/documentations/uralkal/cde-api-worker-copy.yaml b/apps/documentations/uralkal/cde-api-worker-copy.yaml new file mode 100644 index 0000000..29195eb --- /dev/null +++ b/apps/documentations/uralkal/cde-api-worker-copy.yaml @@ -0,0 +1,236 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-copy + namespace: documentations +spec: + values: + services: + worker-copy: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-copy" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_SYSTEMLOG_BASE_URL + value: + _default: "http://backend-svc.system-log.svc.cluster.local:80" + - name: CDE_API_SYSTEMLOG_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "false" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_WORKFLOW_BASE_URL + value: + _default: "http://backend-svc.processing.svc.cluster.local:80" + - name: CDE_API_WORKFLOW_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKFLOW_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_V2_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_BIMAPI_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_TIMEOUT_V2_MS + value: + _default: "300000" + - name: CDE_API_CONTAINER_REGISTRY + value: + _default: "cr.yandex/crp3ccidau046kdj8g9q" + - name: CDE_API_WORKFLOWS_IMAGES_VERSION + value: + _default: "master" + - name: CDE_API_DJANGO_HOST + value: + _default: "http://backend-svc.django.svc.cluster.local:80" + - name: CDE_API_ENVIRONMENT + value: + _default: "production" + - name: CDE_API_CONVERTED_PDF_TO_S3 + value: + _default: "true" + - name: CDE_API_CONVERT_DXF_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_CONVERT_DWG_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_USE_BIMV1_FOR_BIMV2 + value: + _default: "true" + - name: CDE_API_LAST_MASTER_BIM + value: + _default: "36311" + - name: CDE_API_LAST_SLAVE_1_BIM + value: + _default: "94015" + - name: CDE_API_LAST_SLAVE_2_BIM + value: + _default: "135771" + - name: CDE_API_USE_BIM_INSERTER + value: + _default: "true" + - name: CDE_API_USE_LEGACY_BIM_FLOW + value: + _default: "0" + - name: CDE_API_DOCUMENTATION_V2_URL + value: + _default: "http://backend-api-svc.documentations.svc.cluster.local:80" + - name: CDE_API_INTERNAL_URL + value: + _default: "http://cde-api.documentations:8000" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_WORKSPACE_BASE_URL + value: + _default: "http://backend-svc.workspaces.svc.cluster.local:80" + - name: CDE_API_WORKSPACE_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKSPACE_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_RABBITMQ__MARKS_ROUTING_KEY + value: + _default: "pdf_markings_input" + - name: CDE_API_RABBITMQ__HASHER_ROUTING_KEY + value: + _default: "hash.compute.normal" + - name: CDE_API_RABBITMQ__HASHER_EXCHANGE + value: + _default: "hash.compute" + - name: CDE_API_ISSUES_SYNC_ENABLED + value: + _default: "false" + - name: CDE_API_ISSUES_BASE_URL + value: + _default: "http://issues-service.platform:8000" + - name: CDE_API_ISSUES_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_ISSUES_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_COPY_WORKER_JOBS + value: + _default: "" + - name: CDE_API_COPY_JOB_TIMEOUT_MINUTES + value: + _default: "30" + - name: CDE_API_COPY_STEP_PARALLELISM + value: + _default: "1" + - name: CDE_API_COPY_S3_PARALLELISM + value: + _default: "1" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" + - name: CDE_API_RABBITMQ__HOST + value: + _default: "rabbitmq.rabbitmq.svc.cluster.local" + - name: CDE_API_RABBITMQ__PORT + value: + _default: "5672" diff --git a/apps/documentations/uralkal/cde-api-worker-move.yaml b/apps/documentations/uralkal/cde-api-worker-move.yaml new file mode 100644 index 0000000..ebbe8e7 --- /dev/null +++ b/apps/documentations/uralkal/cde-api-worker-move.yaml @@ -0,0 +1,218 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-move + namespace: documentations +spec: + values: + services: + worker-move: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-move" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_SYSTEMLOG_BASE_URL + value: + _default: "http://backend-svc.system-log.svc.cluster.local:80" + - name: CDE_API_SYSTEMLOG_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "10" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "false" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_WORKFLOW_BASE_URL + value: + _default: "http://backend-svc.processing.svc.cluster.local:80" + - name: CDE_API_WORKFLOW_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKFLOW_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_V2_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_BIMAPI_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_TIMEOUT_V2_MS + value: + _default: "300000" + - name: CDE_API_CONTAINER_REGISTRY + value: + _default: "cr.yandex/crp3ccidau046kdj8g9q" + - name: CDE_API_WORKFLOWS_IMAGES_VERSION + value: + _default: "master" + - name: CDE_API_DJANGO_HOST + value: + _default: "http://backend-svc.django.svc.cluster.local:80" + - name: CDE_API_ENVIRONMENT + value: + _default: "production" + - name: CDE_API_CONVERTED_PDF_TO_S3 + value: + _default: "true" + - name: CDE_API_CONVERT_DXF_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_CONVERT_DWG_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_USE_BIMV1_FOR_BIMV2 + value: + _default: "true" + - name: CDE_API_LAST_MASTER_BIM + value: + _default: "36311" + - name: CDE_API_LAST_SLAVE_1_BIM + value: + _default: "94015" + - name: CDE_API_LAST_SLAVE_2_BIM + value: + _default: "135771" + - name: CDE_API_USE_BIM_INSERTER + value: + _default: "true" + - name: CDE_API_USE_LEGACY_BIM_FLOW + value: + _default: "0" + - name: CDE_API_DOCUMENTATION_V2_URL + value: + _default: "http://backend-api-svc.documentations.svc.cluster.local:80" + - name: CDE_API_INTERNAL_URL + value: + _default: "http://cde-api.documentations:8000" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_WORKSPACE_BASE_URL + value: + _default: "http://backend-svc.workspaces.svc.cluster.local:80" + - name: CDE_API_WORKSPACE_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKSPACE_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_RABBITMQ__MARKS_ROUTING_KEY + value: + _default: "pdf_markings_input" + - name: CDE_API_RABBITMQ__HASHER_ROUTING_KEY + value: + _default: "hash.compute.normal" + - name: CDE_API_RABBITMQ__HASHER_EXCHANGE + value: + _default: "hash.compute" + - name: CDE_API_MOVE_WORKER_JOBS + value: + _default: "" + - name: CDE_API_MOVE_JOB_TIMEOUT_MINUTES + value: + _default: "30" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" + - name: CDE_API_RABBITMQ__HOST + value: + _default: "rabbitmq.rabbitmq.svc.cluster.local" + - name: CDE_API_RABBITMQ__PORT + value: + _default: "5672" diff --git a/apps/documentations/uralkal/cde-api-worker-s32d-create-upload.yaml b/apps/documentations/uralkal/cde-api-worker-s32d-create-upload.yaml new file mode 100644 index 0000000..fdda894 --- /dev/null +++ b/apps/documentations/uralkal/cde-api-worker-s32d-create-upload.yaml @@ -0,0 +1,125 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-s32d-create-upload + namespace: documentations +spec: + values: + services: + worker-s32d-create-upload: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-s32d-create-upload" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "false" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_S32D_READERAT_BLOCK_SIZE_MB + value: + _default: "8" + - name: CDE_API_S32D_READERAT_CACHE_BLOCKS + value: + _default: "8" + - name: CDE_API_S32D_WORKER_CREATE_UPLOAD_TIMEOUT_MIN + value: + _default: "240" + - name: CDE_API_S32D_WORKER_CREATE_UPLOAD_MAX_JOBS + value: + _default: "2" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" diff --git a/apps/documentations/uralkal/cde-api-worker-s32d-handle-error.yaml b/apps/documentations/uralkal/cde-api-worker-s32d-handle-error.yaml new file mode 100644 index 0000000..027a549 --- /dev/null +++ b/apps/documentations/uralkal/cde-api-worker-s32d-handle-error.yaml @@ -0,0 +1,119 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-s32d-handle-error + namespace: documentations +spec: + values: + services: + worker-s32d-handle-error: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-s32d-handle-error" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "2" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "false" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_S32D_WORKER_HANDLE_ERROR_TIMEOUT_MIN + value: + _default: "10" + - name: CDE_API_S32D_WORKER_HANDLE_ERROR_MAX_JOBS + value: + _default: "4" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" diff --git a/apps/documentations/uralkal/cde-api-worker-s32d-process-workflows.yaml b/apps/documentations/uralkal/cde-api-worker-s32d-process-workflows.yaml new file mode 100644 index 0000000..9645910 --- /dev/null +++ b/apps/documentations/uralkal/cde-api-worker-s32d-process-workflows.yaml @@ -0,0 +1,188 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-s32d-process-workflows + namespace: documentations +spec: + values: + services: + worker-s32d-process-workflows: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-s32d-process-workflows" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "false" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_S32D_WORKER_PROCESS_WORKFLOWS_TIMEOUT_MIN + value: + _default: "480" + - name: CDE_API_S32D_WORKER_PROCESS_WORKFLOWS_MAX_JOBS + value: + _default: "2" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_WORKFLOW_BASE_URL + value: + _default: "http://backend-svc.processing.svc.cluster.local:80" + - name: CDE_API_WORKFLOW_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKFLOW_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_V2_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_BIMAPI_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_TIMEOUT_V2_MS + value: + _default: "300000" + - name: CDE_API_CONTAINER_REGISTRY + value: + _default: "cr.yandex/crp3ccidau046kdj8g9q" + - name: CDE_API_WORKFLOWS_IMAGES_VERSION + value: + _default: "master" + - name: CDE_API_DJANGO_HOST + value: + _default: "http://backend-svc.django.svc.cluster.local:80" + - name: CDE_API_ENVIRONMENT + value: + _default: "production" + - name: CDE_API_CONVERTED_PDF_TO_S3 + value: + _default: "true" + - name: CDE_API_CONVERT_DXF_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_CONVERT_DWG_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_USE_BIMV1_FOR_BIMV2 + value: + _default: "true" + - name: CDE_API_LAST_MASTER_BIM + value: + _default: "36311" + - name: CDE_API_LAST_SLAVE_1_BIM + value: + _default: "94015" + - name: CDE_API_LAST_SLAVE_2_BIM + value: + _default: "135771" + - name: CDE_API_USE_BIM_INSERTER + value: + _default: "true" + - name: CDE_API_USE_LEGACY_BIM_FLOW + value: + _default: "0" + - name: CDE_API_DOCUMENTATION_V2_URL + value: + _default: "http://backend-api-svc.documentations.svc.cluster.local:80" + - name: CDE_API_INTERNAL_URL + value: + _default: "http://cde-api.documentations:8000" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" diff --git a/apps/documentations/uralkal/cde-api-worker-s32d-publish-documents.yaml b/apps/documentations/uralkal/cde-api-worker-s32d-publish-documents.yaml new file mode 100644 index 0000000..2e8f785 --- /dev/null +++ b/apps/documentations/uralkal/cde-api-worker-s32d-publish-documents.yaml @@ -0,0 +1,134 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-s32d-publish-documents + namespace: documentations +spec: + values: + services: + worker-s32d-publish-documents: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-s32d-publish-documents" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "false" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_S32D_WORKER_PUBLISH_DOCUMENTS_TIMEOUT_MIN + value: + _default: "10" + - name: CDE_API_S32D_WORKER_PUBLISH_DOCUMENTS_MAX_JOBS + value: + _default: "2" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_SYSTEMLOG_BASE_URL + value: + _default: "http://backend-svc.system-log.svc.cluster.local:80" + - name: CDE_API_SYSTEMLOG_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKSPACE_BASE_URL + value: + _default: "http://backend-svc.workspaces.svc.cluster.local:80" + - name: CDE_API_WORKSPACE_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKSPACE_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" diff --git a/apps/documentations/uralkal/cde-api.yaml b/apps/documentations/uralkal/cde-api.yaml index 50fd1f4..c605cb5 100644 --- a/apps/documentations/uralkal/cde-api.yaml +++ b/apps/documentations/uralkal/cde-api.yaml @@ -18,12 +18,6 @@ spec: - name: CDE_API_APP_NAME value: _default: "cde-api" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "debug" @@ -44,13 +38,7 @@ spec: _default: "96" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -185,7 +173,7 @@ spec: _default: "false" - name: CDE_API_DATABASE_OBSERVABILITY_ENABLE value: - _default: "true" + _default: "false" - name: CDE_API_REDIS__DB value: _default: "5" @@ -215,16 +203,16 @@ spec: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" @@ -248,7 +236,7 @@ spec: _default: "http://backend-svc.django.svc.cluster.local:80" - name: CDE_API_DISK_BUCKET_NAMESPACE value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_USERS_ORIGINATOR value: _default: "docs_prod" diff --git a/apps/documentations/uralkal/kustomization.yaml b/apps/documentations/uralkal/kustomization.yaml index 07d5b30..eda45ca 100644 --- a/apps/documentations/uralkal/kustomization.yaml +++ b/apps/documentations/uralkal/kustomization.yaml @@ -31,3 +31,27 @@ patches: target: kind: HelmRelease name: cde-api + - path: cde-api-worker-s32d-create-upload.yaml + target: + kind: HelmRelease + name: cde-api-worker-s32d-create-upload + - path: cde-api-worker-s32d-process-workflows.yaml + target: + kind: HelmRelease + name: cde-api-worker-s32d-process-workflows + - path: cde-api-worker-s32d-publish-documents.yaml + target: + kind: HelmRelease + name: cde-api-worker-s32d-publish-documents + - path: cde-api-worker-s32d-handle-error.yaml + target: + kind: HelmRelease + name: cde-api-worker-s32d-handle-error + - path: cde-api-worker-copy.yaml + target: + kind: HelmRelease + name: cde-api-worker-copy + - path: cde-api-worker-move.yaml + target: + kind: HelmRelease + name: cde-api-worker-move diff --git a/apps/documentations/vad/cde-api-worker-copy.yaml b/apps/documentations/vad/cde-api-worker-copy.yaml new file mode 100644 index 0000000..29195eb --- /dev/null +++ b/apps/documentations/vad/cde-api-worker-copy.yaml @@ -0,0 +1,236 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-copy + namespace: documentations +spec: + values: + services: + worker-copy: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-copy" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_SYSTEMLOG_BASE_URL + value: + _default: "http://backend-svc.system-log.svc.cluster.local:80" + - name: CDE_API_SYSTEMLOG_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "false" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_WORKFLOW_BASE_URL + value: + _default: "http://backend-svc.processing.svc.cluster.local:80" + - name: CDE_API_WORKFLOW_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKFLOW_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_V2_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_BIMAPI_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_TIMEOUT_V2_MS + value: + _default: "300000" + - name: CDE_API_CONTAINER_REGISTRY + value: + _default: "cr.yandex/crp3ccidau046kdj8g9q" + - name: CDE_API_WORKFLOWS_IMAGES_VERSION + value: + _default: "master" + - name: CDE_API_DJANGO_HOST + value: + _default: "http://backend-svc.django.svc.cluster.local:80" + - name: CDE_API_ENVIRONMENT + value: + _default: "production" + - name: CDE_API_CONVERTED_PDF_TO_S3 + value: + _default: "true" + - name: CDE_API_CONVERT_DXF_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_CONVERT_DWG_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_USE_BIMV1_FOR_BIMV2 + value: + _default: "true" + - name: CDE_API_LAST_MASTER_BIM + value: + _default: "36311" + - name: CDE_API_LAST_SLAVE_1_BIM + value: + _default: "94015" + - name: CDE_API_LAST_SLAVE_2_BIM + value: + _default: "135771" + - name: CDE_API_USE_BIM_INSERTER + value: + _default: "true" + - name: CDE_API_USE_LEGACY_BIM_FLOW + value: + _default: "0" + - name: CDE_API_DOCUMENTATION_V2_URL + value: + _default: "http://backend-api-svc.documentations.svc.cluster.local:80" + - name: CDE_API_INTERNAL_URL + value: + _default: "http://cde-api.documentations:8000" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_WORKSPACE_BASE_URL + value: + _default: "http://backend-svc.workspaces.svc.cluster.local:80" + - name: CDE_API_WORKSPACE_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKSPACE_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_RABBITMQ__MARKS_ROUTING_KEY + value: + _default: "pdf_markings_input" + - name: CDE_API_RABBITMQ__HASHER_ROUTING_KEY + value: + _default: "hash.compute.normal" + - name: CDE_API_RABBITMQ__HASHER_EXCHANGE + value: + _default: "hash.compute" + - name: CDE_API_ISSUES_SYNC_ENABLED + value: + _default: "false" + - name: CDE_API_ISSUES_BASE_URL + value: + _default: "http://issues-service.platform:8000" + - name: CDE_API_ISSUES_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_ISSUES_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_COPY_WORKER_JOBS + value: + _default: "" + - name: CDE_API_COPY_JOB_TIMEOUT_MINUTES + value: + _default: "30" + - name: CDE_API_COPY_STEP_PARALLELISM + value: + _default: "1" + - name: CDE_API_COPY_S3_PARALLELISM + value: + _default: "1" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" + - name: CDE_API_RABBITMQ__HOST + value: + _default: "rabbitmq.rabbitmq.svc.cluster.local" + - name: CDE_API_RABBITMQ__PORT + value: + _default: "5672" diff --git a/apps/documentations/vad/cde-api-worker-move.yaml b/apps/documentations/vad/cde-api-worker-move.yaml new file mode 100644 index 0000000..ebbe8e7 --- /dev/null +++ b/apps/documentations/vad/cde-api-worker-move.yaml @@ -0,0 +1,218 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-move + namespace: documentations +spec: + values: + services: + worker-move: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-move" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_SYSTEMLOG_BASE_URL + value: + _default: "http://backend-svc.system-log.svc.cluster.local:80" + - name: CDE_API_SYSTEMLOG_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "10" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "false" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_WORKFLOW_BASE_URL + value: + _default: "http://backend-svc.processing.svc.cluster.local:80" + - name: CDE_API_WORKFLOW_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKFLOW_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_V2_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_BIMAPI_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_TIMEOUT_V2_MS + value: + _default: "300000" + - name: CDE_API_CONTAINER_REGISTRY + value: + _default: "cr.yandex/crp3ccidau046kdj8g9q" + - name: CDE_API_WORKFLOWS_IMAGES_VERSION + value: + _default: "master" + - name: CDE_API_DJANGO_HOST + value: + _default: "http://backend-svc.django.svc.cluster.local:80" + - name: CDE_API_ENVIRONMENT + value: + _default: "production" + - name: CDE_API_CONVERTED_PDF_TO_S3 + value: + _default: "true" + - name: CDE_API_CONVERT_DXF_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_CONVERT_DWG_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_USE_BIMV1_FOR_BIMV2 + value: + _default: "true" + - name: CDE_API_LAST_MASTER_BIM + value: + _default: "36311" + - name: CDE_API_LAST_SLAVE_1_BIM + value: + _default: "94015" + - name: CDE_API_LAST_SLAVE_2_BIM + value: + _default: "135771" + - name: CDE_API_USE_BIM_INSERTER + value: + _default: "true" + - name: CDE_API_USE_LEGACY_BIM_FLOW + value: + _default: "0" + - name: CDE_API_DOCUMENTATION_V2_URL + value: + _default: "http://backend-api-svc.documentations.svc.cluster.local:80" + - name: CDE_API_INTERNAL_URL + value: + _default: "http://cde-api.documentations:8000" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_WORKSPACE_BASE_URL + value: + _default: "http://backend-svc.workspaces.svc.cluster.local:80" + - name: CDE_API_WORKSPACE_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKSPACE_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_RABBITMQ__MARKS_ROUTING_KEY + value: + _default: "pdf_markings_input" + - name: CDE_API_RABBITMQ__HASHER_ROUTING_KEY + value: + _default: "hash.compute.normal" + - name: CDE_API_RABBITMQ__HASHER_EXCHANGE + value: + _default: "hash.compute" + - name: CDE_API_MOVE_WORKER_JOBS + value: + _default: "" + - name: CDE_API_MOVE_JOB_TIMEOUT_MINUTES + value: + _default: "30" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" + - name: CDE_API_RABBITMQ__HOST + value: + _default: "rabbitmq.rabbitmq.svc.cluster.local" + - name: CDE_API_RABBITMQ__PORT + value: + _default: "5672" diff --git a/apps/documentations/vad/cde-api-worker-s32d-create-upload.yaml b/apps/documentations/vad/cde-api-worker-s32d-create-upload.yaml new file mode 100644 index 0000000..fdda894 --- /dev/null +++ b/apps/documentations/vad/cde-api-worker-s32d-create-upload.yaml @@ -0,0 +1,125 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-s32d-create-upload + namespace: documentations +spec: + values: + services: + worker-s32d-create-upload: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-s32d-create-upload" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "false" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_S32D_READERAT_BLOCK_SIZE_MB + value: + _default: "8" + - name: CDE_API_S32D_READERAT_CACHE_BLOCKS + value: + _default: "8" + - name: CDE_API_S32D_WORKER_CREATE_UPLOAD_TIMEOUT_MIN + value: + _default: "240" + - name: CDE_API_S32D_WORKER_CREATE_UPLOAD_MAX_JOBS + value: + _default: "2" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" diff --git a/apps/documentations/vad/cde-api-worker-s32d-handle-error.yaml b/apps/documentations/vad/cde-api-worker-s32d-handle-error.yaml new file mode 100644 index 0000000..027a549 --- /dev/null +++ b/apps/documentations/vad/cde-api-worker-s32d-handle-error.yaml @@ -0,0 +1,119 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-s32d-handle-error + namespace: documentations +spec: + values: + services: + worker-s32d-handle-error: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-s32d-handle-error" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "2" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "false" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_S32D_WORKER_HANDLE_ERROR_TIMEOUT_MIN + value: + _default: "10" + - name: CDE_API_S32D_WORKER_HANDLE_ERROR_MAX_JOBS + value: + _default: "4" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" diff --git a/apps/documentations/vad/cde-api-worker-s32d-process-workflows.yaml b/apps/documentations/vad/cde-api-worker-s32d-process-workflows.yaml new file mode 100644 index 0000000..9645910 --- /dev/null +++ b/apps/documentations/vad/cde-api-worker-s32d-process-workflows.yaml @@ -0,0 +1,188 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-s32d-process-workflows + namespace: documentations +spec: + values: + services: + worker-s32d-process-workflows: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-s32d-process-workflows" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "false" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_S32D_WORKER_PROCESS_WORKFLOWS_TIMEOUT_MIN + value: + _default: "480" + - name: CDE_API_S32D_WORKER_PROCESS_WORKFLOWS_MAX_JOBS + value: + _default: "2" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_WORKFLOW_BASE_URL + value: + _default: "http://backend-svc.processing.svc.cluster.local:80" + - name: CDE_API_WORKFLOW_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKFLOW_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_V2_URL + value: + _default: "http://backend-svc.bim.svc.cluster.local:80" + - name: CDE_API_BIMAPI_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_BIMAPI_TIMEOUT_MS + value: + _default: "30000" + - name: CDE_API_BIMAPI_TIMEOUT_V2_MS + value: + _default: "300000" + - name: CDE_API_CONTAINER_REGISTRY + value: + _default: "cr.yandex/crp3ccidau046kdj8g9q" + - name: CDE_API_WORKFLOWS_IMAGES_VERSION + value: + _default: "master" + - name: CDE_API_DJANGO_HOST + value: + _default: "http://backend-svc.django.svc.cluster.local:80" + - name: CDE_API_ENVIRONMENT + value: + _default: "production" + - name: CDE_API_CONVERTED_PDF_TO_S3 + value: + _default: "true" + - name: CDE_API_CONVERT_DXF_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_CONVERT_DWG_TO_GEOJSON + value: + _default: "true" + - name: CDE_API_USE_BIMV1_FOR_BIMV2 + value: + _default: "true" + - name: CDE_API_LAST_MASTER_BIM + value: + _default: "36311" + - name: CDE_API_LAST_SLAVE_1_BIM + value: + _default: "94015" + - name: CDE_API_LAST_SLAVE_2_BIM + value: + _default: "135771" + - name: CDE_API_USE_BIM_INSERTER + value: + _default: "true" + - name: CDE_API_USE_LEGACY_BIM_FLOW + value: + _default: "0" + - name: CDE_API_DOCUMENTATION_V2_URL + value: + _default: "http://backend-api-svc.documentations.svc.cluster.local:80" + - name: CDE_API_INTERNAL_URL + value: + _default: "http://cde-api.documentations:8000" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" diff --git a/apps/documentations/vad/cde-api-worker-s32d-publish-documents.yaml b/apps/documentations/vad/cde-api-worker-s32d-publish-documents.yaml new file mode 100644 index 0000000..2e8f785 --- /dev/null +++ b/apps/documentations/vad/cde-api-worker-s32d-publish-documents.yaml @@ -0,0 +1,134 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-api-worker-s32d-publish-documents + namespace: documentations +spec: + values: + services: + worker-s32d-publish-documents: + envs: + - name: CDE_API_EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local:80" + - name: CDE_API_APP_NAME + value: + _default: "worker-s32d-publish-documents" + - name: CDE_API_LOG_LEVEL + value: + _default: "info" + - name: CDE_API_OBSERVABILITY_ENABLE + value: + _default: "false" + - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE + value: + _default: "5368709120" + - name: CDE_API_S3_MAX_PART_SIZE + value: + _default: "524288000" + - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT + value: + _default: "10m" + - name: CDE_API_DATABASE__SSLMODE + value: + _default: "disable" + - name: CDE_API_DATABASE__INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_DATABASE_MAX_CONN_LIFETIME + value: + _default: "30m" + - name: CDE_API_DATABASE_MAX_CONN_IDLE_TIME + value: + _default: "10m" + - name: CDE_API_DATABASE_HEALTH_CHECK_PERIOD + value: + _default: "30s" + - name: CDE_API_DATABASE_POOL_SIZE + value: + _default: "3" + - name: CDE_API_REDIS__SSL + value: + _default: "false" + - name: CDE_API_REDIS__POOL_SIZE + value: + _default: "5" + - name: CDE_API_REDIS__MIN_IDLE_CONNS + value: + _default: "1" + - name: CDE_API_REDIS__DIAL_TIMEOUT_MS + value: + _default: "5000" + - name: CDE_API_REDIS__READ_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__WRITE_TIMEOUT_MS + value: + _default: "3000" + - name: CDE_API_REDIS__DEFAULT_TTL_MINUTES + value: + _default: "10" + - name: CDE_API_REDIS__PERMISSION_CACHE_ENABLED + value: + _default: "false" + - name: CDE_API_S3_USE_SSL + value: + _default: "false" + - name: CDE_API_S3_BUCKET_LOOKUP + value: + _default: "auto" + - name: CDE_API_S3_INSECURE_SKIP_TLS + value: + _default: "false" + - name: CDE_API_S3_CHECK_BUCKET + value: + _default: "false" + - name: CDE_API_S3_BUCKET_NAME + value: + _default: "documentations" + - name: CDE_API_ZEEBE_USE_PLAINTEXT + value: + _default: "true" + - name: CDE_API_S32D_WORKER_PUBLISH_DOCUMENTS_TIMEOUT_MIN + value: + _default: "10" + - name: CDE_API_S32D_WORKER_PUBLISH_DOCUMENTS_MAX_JOBS + value: + _default: "2" + - name: CDE_API_MAILER_BASE_URL + value: + _default: "http://mailer-service.mailer:8000" + - name: CDE_API_MAILER_FROM_EMAIL + value: + _default: "noreply@sarex.io" + - name: CDE_API_SYSTEMLOG_BASE_URL + value: + _default: "http://backend-svc.system-log.svc.cluster.local:80" + - name: CDE_API_SYSTEMLOG_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_FLOWS_URL + value: + _default: "http://backend-svc.flows.svc.cluster.local:80" + - name: CDE_API_TRANSMITTALS_URL + value: + _default: "http://transmittal-service.transmittal.svc.cluster.local:80" + - name: CDE_API_WORKSPACE_BASE_URL + value: + _default: "http://backend-svc.workspaces.svc.cluster.local:80" + - name: CDE_API_WORKSPACE_RETRY_COUNT + value: + _default: "3" + - name: CDE_API_WORKSPACE_TIMEOUT_MS + value: + _default: "10000" + - name: CDE_API_WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks_execution_config.json" + - name: CDE_API_REDIS__HOST + value: + _default: "redis" + - name: CDE_API_REDIS__PORT + value: + _default: "6379" diff --git a/apps/documentations/vad/cde-api.yaml b/apps/documentations/vad/cde-api.yaml index 4aac567..0fd6826 100644 --- a/apps/documentations/vad/cde-api.yaml +++ b/apps/documentations/vad/cde-api.yaml @@ -18,12 +18,6 @@ spec: - name: CDE_API_APP_NAME value: _default: "cde-api" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "debug" @@ -44,13 +38,7 @@ spec: _default: "96" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -185,7 +173,7 @@ spec: _default: "false" - name: CDE_API_DATABASE_OBSERVABILITY_ENABLE value: - _default: "true" + _default: "false" - name: CDE_API_REDIS__DB value: _default: "5" @@ -215,16 +203,16 @@ spec: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" @@ -248,7 +236,7 @@ spec: _default: "http://backend-svc.django.svc.cluster.local:80" - name: CDE_API_DISK_BUCKET_NAMESPACE value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_USERS_ORIGINATOR value: _default: "docs_prod" diff --git a/apps/documentations/vad/kustomization.yaml b/apps/documentations/vad/kustomization.yaml index 68a7147..acab1be 100644 --- a/apps/documentations/vad/kustomization.yaml +++ b/apps/documentations/vad/kustomization.yaml @@ -19,3 +19,27 @@ patches: target: kind: HelmRelease name: cde-api + - path: cde-api-worker-s32d-create-upload.yaml + target: + kind: HelmRelease + name: cde-api-worker-s32d-create-upload + - path: cde-api-worker-s32d-process-workflows.yaml + target: + kind: HelmRelease + name: cde-api-worker-s32d-process-workflows + - path: cde-api-worker-s32d-publish-documents.yaml + target: + kind: HelmRelease + name: cde-api-worker-s32d-publish-documents + - path: cde-api-worker-s32d-handle-error.yaml + target: + kind: HelmRelease + name: cde-api-worker-s32d-handle-error + - path: cde-api-worker-copy.yaml + target: + kind: HelmRelease + name: cde-api-worker-copy + - path: cde-api-worker-move.yaml + target: + kind: HelmRelease + name: cde-api-worker-move diff --git a/apps/documentations/wb/cde-api-worker-copy.yaml b/apps/documentations/wb/cde-api-worker-copy.yaml index 12b224f..2f43d09 100644 --- a/apps/documentations/wb/cde-api-worker-copy.yaml +++ b/apps/documentations/wb/cde-api-worker-copy.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-copy" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-copy" - name: CDE_API_SYSTEMLOG_BASE_URL value: _default: "http://api-service.system-log.svc.cluster.local:8000" @@ -140,19 +125,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/wb/cde-api-worker-move.yaml b/apps/documentations/wb/cde-api-worker-move.yaml index 6540257..b328d75 100644 --- a/apps/documentations/wb/cde-api-worker-move.yaml +++ b/apps/documentations/wb/cde-api-worker-move.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-move" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-move" - name: CDE_API_SYSTEMLOG_BASE_URL value: _default: "http://api-service.system-log.svc.cluster.local:8000" @@ -140,19 +125,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/wb/cde-api-worker-s32d-create-upload.yaml b/apps/documentations/wb/cde-api-worker-s32d-create-upload.yaml index 10b4484..a5181f5 100644 --- a/apps/documentations/wb/cde-api-worker-s32d-create-upload.yaml +++ b/apps/documentations/wb/cde-api-worker-s32d-create-upload.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-create-upload" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-create-upload" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -134,19 +119,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/wb/cde-api-worker-s32d-handle-error.yaml b/apps/documentations/wb/cde-api-worker-s32d-handle-error.yaml index 122005d..836941e 100644 --- a/apps/documentations/wb/cde-api-worker-s32d-handle-error.yaml +++ b/apps/documentations/wb/cde-api-worker-s32d-handle-error.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-handle-error" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-handle-error" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -134,19 +119,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/wb/cde-api-worker-s32d-process-workflows.yaml b/apps/documentations/wb/cde-api-worker-s32d-process-workflows.yaml index e66f216..eab7db6 100644 --- a/apps/documentations/wb/cde-api-worker-s32d-process-workflows.yaml +++ b/apps/documentations/wb/cde-api-worker-s32d-process-workflows.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-process-workflows" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-process-workflows" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -134,19 +119,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/wb/cde-api-worker-s32d-publish-documents.yaml b/apps/documentations/wb/cde-api-worker-s32d-publish-documents.yaml index b8e37b6..ea36642 100644 --- a/apps/documentations/wb/cde-api-worker-s32d-publish-documents.yaml +++ b/apps/documentations/wb/cde-api-worker-s32d-publish-documents.yaml @@ -60,24 +60,12 @@ spec: - name: CDE_API_APP_NAME value: _default: "worker-s32d-publish-documents" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "info" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -87,9 +75,6 @@ spec: - name: CDE_API_S3_UPLOAD_STALL_TIMEOUT value: _default: "10m" - - name: CDE_API_OBSERVABILITY_SERVICE_NAME - value: - _default: "worker-s32d-publish-documents" - name: CDE_API_DATABASE__SSLMODE value: _default: "disable" @@ -134,19 +119,19 @@ spec: _default: "false" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_ZEEBE_USE_PLAINTEXT value: _default: "true" diff --git a/apps/documentations/wb/cde-api.yaml b/apps/documentations/wb/cde-api.yaml index 1903ce4..34e8862 100644 --- a/apps/documentations/wb/cde-api.yaml +++ b/apps/documentations/wb/cde-api.yaml @@ -75,12 +75,6 @@ spec: - name: CDE_API_APP_NAME value: _default: "cde-api" - - name: CDE_API_SENTRY_DSN - value: - _default: "" - - name: CDE_API_SENTRY_ENVIRONMENT - value: - _default: "" - name: CDE_API_LOG_LEVEL value: _default: "debug" @@ -101,13 +95,7 @@ spec: _default: "96" - name: CDE_API_OBSERVABILITY_ENABLE value: - _default: "true" - - name: CDE_API_OBSERVABILITY_HOST - value: - _default: "signoz-otel-collector-external.signoz.svc.cluster.local" - - name: CDE_API_OBSERVABILITY_PORT - value: - _default: "4317" + _default: "false" - name: CDE_API_S3_MAX_SINGLE_UPLOAD_SIZE value: _default: "5368709120" @@ -242,7 +230,7 @@ spec: _default: "false" - name: CDE_API_DATABASE_OBSERVABILITY_ENABLE value: - _default: "true" + _default: "false" - name: CDE_API_REDIS__DB value: _default: "5" @@ -272,16 +260,16 @@ spec: _default: "false" - name: CDE_API_S3_BUCKET_NAME value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_S3_USE_SSL value: - _default: "true" + _default: "false" - name: CDE_API_S3_BUCKET_LOOKUP value: _default: "auto" - name: CDE_API_S3_INSECURE_SKIP_TLS value: - _default: "true" + _default: "false" - name: CDE_API_S3_CHECK_BUCKET value: _default: "false" @@ -305,7 +293,7 @@ spec: _default: "http://backend.django.svc.cluster.local:8000" - name: CDE_API_DISK_BUCKET_NAMESPACE value: - _default: "documentations-prod" + _default: "documentations" - name: CDE_API_USERS_ORIGINATOR value: _default: "docs_prod" diff --git a/apps/documentations/wb/kustomization.yaml b/apps/documentations/wb/kustomization.yaml index 9f9c2ab..a36518d 100644 --- a/apps/documentations/wb/kustomization.yaml +++ b/apps/documentations/wb/kustomization.yaml @@ -20,3 +20,4 @@ resources: - cde-api-worker-s32d-handle-error.yaml - cde-api-worker-copy.yaml - cde-api-worker-move.yaml + - outbox-relay.yaml diff --git a/apps/documentations/wb/outbox-relay.yaml b/apps/documentations/wb/outbox-relay.yaml new file mode 100644 index 0000000..d85d50c --- /dev/null +++ b/apps/documentations/wb/outbox-relay.yaml @@ -0,0 +1,130 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: outbox-relay + namespace: documentations +spec: + interval: 10m + chart: + spec: + chart: universal-chart + version: "0.1.7" + sourceRef: + kind: HelmRepository + name: yc-oci-charts + namespace: flux-system + interval: 10m + install: + remediation: + retries: 3 + upgrade: + remediation: + retries: 3 + values: + global: + env: _default + services: + outbox-relay: + enabled: true + deployment: + enabled: true + name: + _default: outbox-relay + replicaCount: + _default: 1 + revisionHistoryLimit: + _default: 5 + resources: + requests: + cpu: + _default: 100m + memory: + _default: 128Mi + image: + name: + _default: cr.yandex/crp3ccidau046kdj8g9q/outbox-relay:prod_bee3b2a + pullPolicy: + _default: IfNotPresent + service: + enabled: false + imagePullSecrets: + enabled: + _default: true + name: + _default: dockerhub + envs: + - name: OUTBOX_RELAY_APP_NAME + value: + _default: "cde-api-outbox-relay" + - name: OUTBOX_RELAY_APP_VERSION + value: + _default: "0.1.0" + - name: OUTBOX_RELAY_LOG_LEVEL + value: + _default: "info" + - name: OUTBOX_RELAY_SOURCE_SERVICE + value: + _default: "cde-api" + - name: OUTBOX_RELAY_SOURCE_VERSION + value: + _default: "0.1.0" + - name: OUTBOX_RELAY_PG__SSLMODE + value: + _default: "disable" + - name: OUTBOX_RELAY_PG__POOL_MIN + value: + _default: "1" + - name: OUTBOX_RELAY_PG__POOL_MAX + value: + _default: "3" + - name: OUTBOX_RELAY_PG__TABLE + value: + _default: "outbox" + - name: OUTBOX_RELAY_PG__HOST + value: + _default: "sarex-vpsql-01.xc.wb.ru" + - name: OUTBOX_RELAY_PG__PORT + value: + _default: "5432" + - name: OUTBOX_RELAY_PG__NAME + value: + _default: "documentations_db" + - name: OUTBOX_RELAY_POLL_INTERVAL + value: + _default: "500ms" + - name: OUTBOX_RELAY_BATCH_SIZE + value: + _default: "100" + - name: OUTBOX_RELAY_MAX_ATTEMPTS + value: + _default: "8" + - name: OUTBOX_RELAY_INITIAL_BACKOFF + value: + _default: "1s" + - name: OUTBOX_RELAY_MAX_BACKOFF + value: + _default: "5m" + - name: OUTBOX_RELAY_SHUTDOWN_TIMEOUT + value: + _default: "30s" + - name: OUTBOX_RELAY_KAFKA__BROKERS + value: + _default: "wb-prod-kafka-bootstrap.kafka.svc.cluster.local:9093" + - name: OUTBOX_RELAY_KAFKA__SECURITY_PROTOCOL + value: + _default: "SSL" + - name: OUTBOX_RELAY_KAFKA__INSECURE_SKIP_VERIFY + value: + _default: "true" + secretEnvs: + - name: OUTBOX_RELAY_PG__USER + secretName: + _default: "postgres-secret" + secretKey: + _default: "username" + - name: OUTBOX_RELAY_PG__PASSWORD + secretName: + _default: "postgres-secret" + secretKey: + _default: "password" diff --git a/docs/apps/documentations.md b/docs/apps/documentations.md index 1b84ead..1409422 100644 --- a/docs/apps/documentations.md +++ b/docs/apps/documentations.md @@ -17,6 +17,7 @@ flowchart LR PDM[deployment: pdm
product data mgmt]:::comp CDEAPI[deployment: cde-api
новый CDE API]:::comp Workers[deployments: cde-api-worker-*
s32d x4, copy, move]:::comp + Relay[deployment: outbox-relay
outbox → Kafka]:::comp Frontend --> API API --> Filestream API --> PDM @@ -25,6 +26,7 @@ flowchart LR end Zeebe[Camunda / Zeebe]:::infra + Kafka[Kafka]:::infra CDEPG[(PostgreSQL, общий)]:::data Valkey[(Valkey)]:::data @@ -45,6 +47,8 @@ flowchart LR CDEAPI -->|files| S3 Workers --> CDEPG Workers -->|jobs| Zeebe + Relay -->|poll outbox| CDEPG + Relay -->|events| Kafka classDef comp fill:#ec4899,stroke:#9d174d,stroke-width:2px,color:#fff classDef peer fill:#fce7f3,stroke:#9d174d,color:#000 @@ -59,6 +63,7 @@ flowchart LR `cde-api` — новый CDE API (Go) и 6 воркеров (`s32d-create-upload`, `s32d-process-workflows`, `s32d-publish-documents`, `s32d-handle-error`, `copy`, `move`), развёрнутых в ns `documentations`. Не путать с легаси-сервисом `cde` (`cde-svc.cde`, см. `cde.md`). - Манифесты: `apps/documentations/base/cde-api*.yaml`, оверлеи — в каталогах контуров (`sarex-contour`, `yc-k8s-test` наследуют `base`; `d8-ugmk-prod`, `uralkal`, `vad` патчат `cde-api`; `ugok`, `brusnika-*`, `wb` — полные копии). -- Postgres, Valkey (`redis`) и S3 общие с documentations. Секреты — Vault Agent (в образы cde-api добавлен busybox для shell-обёртки запуска); путь `secrets/data/apps/cde-api/zeebe` нужно создать. В k8s-контурах (`ugok`, `brusnika-*`, `wb`) вместо Vault используются Secret'ы. -- CronJob'ы (`workspace-recovery`, `resource-id-backfill`, `sizer`) пока не перенесены. +- Postgres, Valkey (`redis`) и S3 общие с documentations. Секреты — Vault Agent; путь `secrets/data/apps/cde-api/zeebe` нужно создать. В k8s-контурах (`ugok`, `brusnika-*`, `wb`) вместо Vault используются Secret'ы. +- `outbox-relay` (`apps/documentations/outbox-relay.CONFIGURATION.md`) — воркер transactional outbox: читает таблицу `outbox` в общей БД и публикует события cde-api в Kafka. Kafka — своя в каждом контуре; для vault-контуров нужен Vault-путь `secrets/data/kafka/apps/documentations`. +- CronJob'ы (`workspace-recovery`, `resource-id-backfill`, `sizer`) подготовлены в `apps/documentations/cronjobs/` как обычные `CronJob`, но не подключены. - Подробности: `apps/documentations/cde-api.CONFIGURATION.md`, `cde-api.ENDPOINTS.md`, `cde-api.env.example`, `cde-api.openapi.yaml`. diff --git a/infrastructure/istio-config/brusnika-prod/istio-config.yaml b/infrastructure/istio-config/brusnika-prod/istio-config.yaml index b51fe1b..16b89c7 100644 --- a/infrastructure/istio-config/brusnika-prod/istio-config.yaml +++ b/infrastructure/istio-config/brusnika-prod/istio-config.yaml @@ -1059,6 +1059,35 @@ spec: rewrite: /api/ service: documentations-filestream.documentations.svc.cluster.local port: 8080 + cde-api: + namespace: documentations + hosts: + - cde.brusnika.ru + gateways: + - ingress-nginx/global-cde-gw + cors: + allowCredentials: true + alloallowCredentials: true + allowOrigins: + - exact: https://cde.brusnika.ru + - exact: https://stamp-verification.cde.brusnika.ru + - exact: https://document-link.cde.brusnika.ru + extraAllowMethods: + - HEAD + extraAllowHeaders: + - Range + - Cache-Control + routes: + - path: + prefix: /documentations/v2/ + rewrite: /external/v2 + service: documentations-api.documentations.svc.cluster.local + port: 8000 + - path: + prefix: /cde/app/ + rewrite: /app/ + service: documentations-filestream.documentations.svc.cluster.local + port: 8000 issues-vs: namespace: issues hosts: diff --git a/infrastructure/istio-config/brusnika-stage/istio-config.yaml b/infrastructure/istio-config/brusnika-stage/istio-config.yaml index 5d37391..29793a8 100644 --- a/infrastructure/istio-config/brusnika-stage/istio-config.yaml +++ b/infrastructure/istio-config/brusnika-stage/istio-config.yaml @@ -938,6 +938,32 @@ spec: rewrite: /api/ service: documentations-api.documentations.svc.cluster.local port: 8080 + vs-cde-api: + namespace: documentations + hosts: + - test.sarex.brusnika.tech + gateways: + - ingress-nginx/main-gateway + cors: + allowOrigins: + - exact: "*" + extraAllowMethods: + - HEAD + extraAllowHeaders: + - Range + - Cache-control + allowCredentials: true + routes: + - path: + prefix: /documentations/v2/ + rewrite: /external/v2 + service: cde-api.documentations.svc.cluster.local + port: 8000 + - path: + prefix: /cde/app/ + rewrite: /app/ + service: cde-api.documentations.svc.cluster.local + port: 8000 vs-documentations-frontend: namespace: ingress-nginx diff --git a/infrastructure/istio-config/d8-ugmk-prod/istio-config.yaml b/infrastructure/istio-config/d8-ugmk-prod/istio-config.yaml index a304339..f0c35fb 100644 --- a/infrastructure/istio-config/d8-ugmk-prod/istio-config.yaml +++ b/infrastructure/istio-config/d8-ugmk-prod/istio-config.yaml @@ -153,6 +153,24 @@ spec: rewrite: /api/ service: backend-api-svc.documentations.svc.cluster.local port: 80 + cde-api: + name: cde-api-virt-service + namespace: default + hosts: + - sarex.uralmine.com + gateways: + - default/platform-gateway + routes: + - path: + prefix: /documentations/v2/ + rewrite: /external/v2/ + service: cde-api.documentations.svc.cluster.local + port: 8000 + - path: + prefix: /cde/app/ + rewrite: /app/ + service: cde-api.documentations.svc.cluster.local + port: 8000 workspaces-api: name: workspaces-api-virt-service namespace: default @@ -425,8 +443,8 @@ spec: rewrite: /eav/admin/ service: backend-svc.eav.svc.cluster.local port: 80 - cde-api: - name: cde-api-virt-service + cde-orchestrator: + name: cde-orchestrator-virt-service namespace: default hosts: - sarex.uralmine.com diff --git a/infrastructure/istio-config/uralkal/istio-config.yaml b/infrastructure/istio-config/uralkal/istio-config.yaml index f0947ea..484812f 100644 --- a/infrastructure/istio-config/uralkal/istio-config.yaml +++ b/infrastructure/istio-config/uralkal/istio-config.yaml @@ -168,6 +168,24 @@ spec: rewrite: /api/ service: backend-api-svc.documentations.svc.cluster.local port: 80 + cde-api: + name: cde-api-virt-service + namespace: default + hosts: + - sarex.local.uralkali.com + gateways: + - default/platform-gateway + routes: + - path: + prefix: /documentations/v2/ + rewrite: /external/v2/ + service: cde-api.documentations.svc.cluster.local + port: 8000 + - path: + prefix: /cde/app/ + rewrite: /app/ + service: cde-api.documentations.svc.cluster.local + port: 8000 workspaces-api: name: workspaces-api-virt-service namespace: default @@ -479,8 +497,8 @@ spec: rewrite: /eav/admin/ service: backend-svc.eav.svc.cluster.local port: 80 - cde-api: - name: cde-api-virt-service + cde-orchestrator: + name: cde-orchestrator-virt-service namespace: default hosts: - sarex.local.uralkali.com diff --git a/infrastructure/istio-config/vad/istio-config.yaml b/infrastructure/istio-config/vad/istio-config.yaml index 22674ad..04c5377 100644 --- a/infrastructure/istio-config/vad/istio-config.yaml +++ b/infrastructure/istio-config/vad/istio-config.yaml @@ -153,6 +153,24 @@ spec: rewrite: /api/ service: backend-api-svc.documentations.svc.cluster.local port: 80 + cde-api: + name: cde-api-virt-service + namespace: default + hosts: + - sarex.vadroad.com + gateways: + - default/platform-gateway + routes: + - path: + prefix: /documentations/v2/ + rewrite: /external/v2/ + service: cde-api.documentations.svc.cluster.local + port: 8000 + - path: + prefix: /cde/app/ + rewrite: /app/ + service: cde-api.documentations.svc.cluster.local + port: 8000 workspaces-api: name: workspaces-api-virt-service namespace: default @@ -399,8 +417,8 @@ spec: rewrite: /eav/admin/ service: backend-svc.eav.svc.cluster.local port: 80 - cde-api: - name: cde-api-virt-service + cde-orchestrator: + name: cde-orchestrator-virt-service namespace: default hosts: - sarex.vadroad.ru