From 6efd29da18944f699fcbd7b97fcbf6475cec55d8 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 31 Aug 2026 20:51:07 +0500 Subject: [PATCH] =?UTF-8?q?fix(brusnika-stage):=20=D0=B1=D0=B8=D1=82=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=B2=D0=BD=D1=83=D1=82=D1=80=D0=B8=D0=BA=D0=BB=D0=B0?= =?UTF-8?q?=D1=81=D1=82=D0=B5=D1=80=D0=BD=D1=8B=D0=B5=20=D1=81=D1=81=D1=8B?= =?UTF-8?q?=D0=BB=D0=BA=D0=B8=20+=20=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BC=D1=83=D1=81=D0=BE=D1=80=D0=BD=D1=8B=D1=85=20=D0=BE?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BB=D0=B5=D0=B5=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - django/s3-proxy: образ export-project -> s3-proxy:stable - message-hub: backend-service.pm -> backend-svc.pm - processing: documentations-filestream-service -> documentations-filestream - resources: minio-service -> minio-svc - documentations: bim-api-service -> backend-service.bim:8000; inspections-service -> backend-service.inspections:8000; remarks-static-service.remarks -> remarks-static.issues:80 - notes: sarex-* namespace -> реальные, documentations-service -> documentations-api, sarex-processing -> ns workflow / workflows-api-service, BASE_HOST уралхим -> test.sarex.brusnika.tech/notes - подключён inspections в clusters/brusnika-stage/kustomization.yaml - удалены мёртвые копипаст-оверлеи cross-section/faas/prescriptions/comparisons (нигде не подключены, побайтовые копии documentations/drawings) brusnika-prod не трогаем. Co-Authored-By: Claude Sonnet 5 --- apps/comparisons/brusnika-stage/backend.yaml | 123 ------------------ .../brusnika-stage/kustomization.yaml | 6 - .../cross-section/brusnika-stage/backend.yaml | 101 -------------- .../brusnika-stage/kustomization.yaml | 6 - apps/django/brusnika-stage/s3-proxy.yaml | 2 +- apps/documentations/brusnika-stage/api.yaml | 2 +- .../brusnika-stage/filestream.yaml | 2 +- apps/documentations/brusnika-stage/pdm.yaml | 4 +- apps/faas/brusnika-stage/backend.yaml | 101 -------------- apps/faas/brusnika-stage/kustomization.yaml | 6 - apps/message-hub/brusnika-stage/backend.yaml | 4 +- apps/notes/brusnika-stage/backend.yaml | 14 +- .../prescriptions/brusnika-stage/backend.yaml | 101 -------------- .../brusnika-stage/kustomization.yaml | 6 - .../processing/brusnika-stage/engine-low.yaml | 2 +- apps/processing/brusnika-stage/engine.yaml | 2 +- .../resources/brusnika-stage/helmrelease.yaml | 2 +- clusters/brusnika-stage/kustomization.yaml | 1 + 18 files changed, 18 insertions(+), 467 deletions(-) delete mode 100644 apps/comparisons/brusnika-stage/backend.yaml delete mode 100644 apps/comparisons/brusnika-stage/kustomization.yaml delete mode 100644 apps/cross-section/brusnika-stage/backend.yaml delete mode 100644 apps/cross-section/brusnika-stage/kustomization.yaml delete mode 100644 apps/faas/brusnika-stage/backend.yaml delete mode 100644 apps/faas/brusnika-stage/kustomization.yaml delete mode 100644 apps/prescriptions/brusnika-stage/backend.yaml delete mode 100644 apps/prescriptions/brusnika-stage/kustomization.yaml diff --git a/apps/comparisons/brusnika-stage/backend.yaml b/apps/comparisons/brusnika-stage/backend.yaml deleted file mode 100644 index 0bb21ba..0000000 --- a/apps/comparisons/brusnika-stage/backend.yaml +++ /dev/null @@ -1,123 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: drawings-api - namespace: drawings - -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: - backend: - enabled: true - - image: - name: - _default: cr.yandex/crp3ccidau046kdj8g9q/drawings-api:015e68e1b2a3dcc13f0b405e1f761b154a825d24 - pullPolicy: - _default: IfNotPresent - - deployment: - enabled: true - - name: - _default: drawings-api - - replicaCount: - _default: 1 - stage: 1 - preprod: 3 - production: 3 - - port: - _default: 8000 - - probes: - liveness: - enabled: false - readiness: - enabled: false - - service: - enabled: true - - name: - _default: drawings-api-service - - type: - _default: ClusterIP - - port: - _default: 8000 - - targetPort: - _default: 8000 - - portName: - _default: http - - imagePullSecrets: - enabled: - _default: true - name: - _default: regcred - labels: - monitoring: prometheus - - envs: - - name: POSTGRES_ADDRESS - value: - _default: "192.168.2.45:5432" - - - name: POSTGRES_DB - value: - _default: "drawings" - - - name: POSTGRES_POOL_SIZE - value: - _default: "3" - - - name: API_ADDRESS - value: - _default: "0.0.0.0:8080" - - - name: ENABLE_SSL - value: - _default: "0" - secretEnvs: - - name: POSTGRES_USER - secretName: - _default: "postgres-secret" - secretKey: "username" - - - name: POSTGRES_PASSWORD - secretName: - _default: "postgres-secret" - secretKey: "password" - - commitSha: "" - gitlabUri: "" - gitlabJobUrl: "" - owner: "" \ No newline at end of file diff --git a/apps/comparisons/brusnika-stage/kustomization.yaml b/apps/comparisons/brusnika-stage/kustomization.yaml deleted file mode 100644 index 7975452..0000000 --- a/apps/comparisons/brusnika-stage/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: drawings -resources: - - backend.yaml \ No newline at end of file diff --git a/apps/cross-section/brusnika-stage/backend.yaml b/apps/cross-section/brusnika-stage/backend.yaml deleted file mode 100644 index c34c6db..0000000 --- a/apps/cross-section/brusnika-stage/backend.yaml +++ /dev/null @@ -1,101 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: measurements - namespace: measurements - -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 - driftDetection: - mode: enabled - - values: - global: - env: _default - - services: - backend: - enabled: true - - image: - name: - _default: cr.yandex/crp3ccidau046kdj8g9q/documentations:prod_5904312b - pullPolicy: - _default: IfNotPresent - - deployment: - enabled: true - - name: - _default: measurements - - replicaCount: - _default: 1 - stage: 1 - preprod: 3 - production: 3 - - port: - _default: 8080 - - probes: - liveness: - enabled: false - readiness: - enabled: false - - service: - enabled: true - - name: - _default: measurements-service - - type: - _default: ClusterIP - - port: - _default: 8000 - - targetPort: - _default: 8000 - - portName: - _default: http - - imagePullSecrets: - enabled: - _default: true - name: - _default: regcred - - - labels: - monitoring: prometheus - secretEnvs: - - name: S3_JSON_SETTINGS - secretName: - _default: "s3-json-settings" - secretKey: "S3_JSON_SETTINGS" - - commitSha: "" - gitlabUri: "" - gitlabJobUrl: "" - owner: "" diff --git a/apps/cross-section/brusnika-stage/kustomization.yaml b/apps/cross-section/brusnika-stage/kustomization.yaml deleted file mode 100644 index ab86f1d..0000000 --- a/apps/cross-section/brusnika-stage/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: measurements -resources: - - backend.yaml diff --git a/apps/django/brusnika-stage/s3-proxy.yaml b/apps/django/brusnika-stage/s3-proxy.yaml index 8945960..3bd7013 100644 --- a/apps/django/brusnika-stage/s3-proxy.yaml +++ b/apps/django/brusnika-stage/s3-proxy.yaml @@ -35,7 +35,7 @@ spec: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/export-project:prod_ef8aa756 + _default: cr.yandex/crp3ccidau046kdj8g9q/s3-proxy:stable pullPolicy: _default: IfNotPresent diff --git a/apps/documentations/brusnika-stage/api.yaml b/apps/documentations/brusnika-stage/api.yaml index 1eed1fd..4a76887 100644 --- a/apps/documentations/brusnika-stage/api.yaml +++ b/apps/documentations/brusnika-stage/api.yaml @@ -194,7 +194,7 @@ spec: - name: BIM_API_URL value: - _default: "http://bim-api-service.bim.svc.cluster.local:8080/" + _default: "http://backend-service.bim.svc.cluster.local:8000/" - name: BIM_API_V2_URL value: diff --git a/apps/documentations/brusnika-stage/filestream.yaml b/apps/documentations/brusnika-stage/filestream.yaml index 6adee7f..d549f30 100644 --- a/apps/documentations/brusnika-stage/filestream.yaml +++ b/apps/documentations/brusnika-stage/filestream.yaml @@ -194,7 +194,7 @@ spec: - name: BIM_API_URL value: - _default: "http://bim-api-service.bim.svc.cluster.local:8080/" + _default: "http://backend-service.bim.svc.cluster.local:8000/" - name: BIM_API_V2_URL value: diff --git a/apps/documentations/brusnika-stage/pdm.yaml b/apps/documentations/brusnika-stage/pdm.yaml index 8d0b3c2..8fecd62 100644 --- a/apps/documentations/brusnika-stage/pdm.yaml +++ b/apps/documentations/brusnika-stage/pdm.yaml @@ -208,7 +208,7 @@ spec: - name: INSPECTIONS_URL value: - _default: "http://inspections-service.inspections.svc.cluster.local:80" + _default: "http://backend-service.inspections.svc.cluster.local:8000" - name: LOG_LEVEL value: @@ -248,7 +248,7 @@ spec: - name: REMARKS_URL value: - _default: "http://remarks-static-service.remarks.svc.cluster.local:8080/remarks" + _default: "http://remarks-static.issues.svc.cluster.local:80/remarks" - name: RESOURCES_URL value: diff --git a/apps/faas/brusnika-stage/backend.yaml b/apps/faas/brusnika-stage/backend.yaml deleted file mode 100644 index c34c6db..0000000 --- a/apps/faas/brusnika-stage/backend.yaml +++ /dev/null @@ -1,101 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: measurements - namespace: measurements - -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 - driftDetection: - mode: enabled - - values: - global: - env: _default - - services: - backend: - enabled: true - - image: - name: - _default: cr.yandex/crp3ccidau046kdj8g9q/documentations:prod_5904312b - pullPolicy: - _default: IfNotPresent - - deployment: - enabled: true - - name: - _default: measurements - - replicaCount: - _default: 1 - stage: 1 - preprod: 3 - production: 3 - - port: - _default: 8080 - - probes: - liveness: - enabled: false - readiness: - enabled: false - - service: - enabled: true - - name: - _default: measurements-service - - type: - _default: ClusterIP - - port: - _default: 8000 - - targetPort: - _default: 8000 - - portName: - _default: http - - imagePullSecrets: - enabled: - _default: true - name: - _default: regcred - - - labels: - monitoring: prometheus - secretEnvs: - - name: S3_JSON_SETTINGS - secretName: - _default: "s3-json-settings" - secretKey: "S3_JSON_SETTINGS" - - commitSha: "" - gitlabUri: "" - gitlabJobUrl: "" - owner: "" diff --git a/apps/faas/brusnika-stage/kustomization.yaml b/apps/faas/brusnika-stage/kustomization.yaml deleted file mode 100644 index ab86f1d..0000000 --- a/apps/faas/brusnika-stage/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: measurements -resources: - - backend.yaml diff --git a/apps/message-hub/brusnika-stage/backend.yaml b/apps/message-hub/brusnika-stage/backend.yaml index c3c8d6d..c193d30 100644 --- a/apps/message-hub/brusnika-stage/backend.yaml +++ b/apps/message-hub/brusnika-stage/backend.yaml @@ -112,11 +112,11 @@ spec: - name: SAREX_BASE_HOST value: - _default: "http://backend-service.pm.svc.cluster.local:8000" + _default: "http://backend-svc.pm.svc.cluster.local:8000" - name: PM_HOST value: - _default: "http://backend-service.pm.svc.cluster.local:8000" + _default: "http://backend-svc.pm.svc.cluster.local:8000" - name: DB_HOST value: diff --git a/apps/notes/brusnika-stage/backend.yaml b/apps/notes/brusnika-stage/backend.yaml index 818472d..3f78dd3 100644 --- a/apps/notes/brusnika-stage/backend.yaml +++ b/apps/notes/brusnika-stage/backend.yaml @@ -89,27 +89,27 @@ spec: envs: - name: DJANGO_HOST value: - _default: "http://backend.sarex-django.svc.cluster.local:8000" + _default: "http://backend.django.svc.cluster.local:8000" - name: DOCUMENTATIONS_HOST value: - _default: "http://documentations-service.sarex-documentations.svc.cluster.local:8080/api/v1" + _default: "http://documentations-api.documentations.svc.cluster.local:8080/api/v1" - name: BASE_HOST value: - _default: "https://sarex.uralchem.com/notes" + _default: "https://test.sarex.brusnika.tech/notes" - name: FAAS_SERVICE value: - _default: "http://generate-document-service.sarex-faas.svc.cluster.local:8000" + _default: "http://generate-document-service.faas.svc.cluster.local:8000" - name: WORKSPACE_URL value: - _default: "http://workspaces-service.sarex-workspaces.svc.cluster.local:8000/api/v1" + _default: "http://workspaces-service.workspaces.svc.cluster.local:8000/api/v1" - name: WORKFLOW_HOST value: - _default: "http://workflows-service.sarex-processing.svc.cluster.local:8000/api/v1" + _default: "http://workflows-api-service.workflow.svc.cluster.local:8000/api/v1" - name: WORKFLOW_TAG value: @@ -137,7 +137,7 @@ spec: - name: ATTACHMENT_HOST value: - _default: "http://attachments-service.sarex-attachments.svc.cluster.local:8000/api/v1" + _default: "http://attachments-service.attachments.svc.cluster.local:8000/api/v1" - name: PG_PORT value: diff --git a/apps/prescriptions/brusnika-stage/backend.yaml b/apps/prescriptions/brusnika-stage/backend.yaml deleted file mode 100644 index c34c6db..0000000 --- a/apps/prescriptions/brusnika-stage/backend.yaml +++ /dev/null @@ -1,101 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: measurements - namespace: measurements - -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 - driftDetection: - mode: enabled - - values: - global: - env: _default - - services: - backend: - enabled: true - - image: - name: - _default: cr.yandex/crp3ccidau046kdj8g9q/documentations:prod_5904312b - pullPolicy: - _default: IfNotPresent - - deployment: - enabled: true - - name: - _default: measurements - - replicaCount: - _default: 1 - stage: 1 - preprod: 3 - production: 3 - - port: - _default: 8080 - - probes: - liveness: - enabled: false - readiness: - enabled: false - - service: - enabled: true - - name: - _default: measurements-service - - type: - _default: ClusterIP - - port: - _default: 8000 - - targetPort: - _default: 8000 - - portName: - _default: http - - imagePullSecrets: - enabled: - _default: true - name: - _default: regcred - - - labels: - monitoring: prometheus - secretEnvs: - - name: S3_JSON_SETTINGS - secretName: - _default: "s3-json-settings" - secretKey: "S3_JSON_SETTINGS" - - commitSha: "" - gitlabUri: "" - gitlabJobUrl: "" - owner: "" diff --git a/apps/prescriptions/brusnika-stage/kustomization.yaml b/apps/prescriptions/brusnika-stage/kustomization.yaml deleted file mode 100644 index ab86f1d..0000000 --- a/apps/prescriptions/brusnika-stage/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: measurements -resources: - - backend.yaml diff --git a/apps/processing/brusnika-stage/engine-low.yaml b/apps/processing/brusnika-stage/engine-low.yaml index b3ce246..c6c9b21 100644 --- a/apps/processing/brusnika-stage/engine-low.yaml +++ b/apps/processing/brusnika-stage/engine-low.yaml @@ -157,7 +157,7 @@ spec: - name: EXTERNAL_FILESTREAM_URL value: - _default: "http://documentations-filestream-service.documentations.svc.cluster.local:8080" + _default: "http://documentations-filestream.documentations.svc.cluster.local:8080" - name: RESOURCES_API_INTERNAL_HOST value: diff --git a/apps/processing/brusnika-stage/engine.yaml b/apps/processing/brusnika-stage/engine.yaml index ff350df..74ca6b4 100644 --- a/apps/processing/brusnika-stage/engine.yaml +++ b/apps/processing/brusnika-stage/engine.yaml @@ -157,7 +157,7 @@ spec: - name: EXTERNAL_FILESTREAM_URL value: - _default: "http://documentations-filestream-service.documentations.svc.cluster.local:8080" + _default: "http://documentations-filestream.documentations.svc.cluster.local:8080" - name: RESOURCES_API_INTERNAL_HOST value: diff --git a/apps/resources/brusnika-stage/helmrelease.yaml b/apps/resources/brusnika-stage/helmrelease.yaml index 5ea3409..ccdf3f0 100644 --- a/apps/resources/brusnika-stage/helmrelease.yaml +++ b/apps/resources/brusnika-stage/helmrelease.yaml @@ -139,7 +139,7 @@ spec: - name: YC_S3_ENDPOINT_URL value: - _default: "http://minio-service.minio.svc.cluster.local:9000" + _default: "http://minio-svc.minio.svc.cluster.local:9000" - name: YC_S3_BUCKET_NAME value: diff --git a/clusters/brusnika-stage/kustomization.yaml b/clusters/brusnika-stage/kustomization.yaml index 12f7f2b..b22b4ac 100644 --- a/clusters/brusnika-stage/kustomization.yaml +++ b/clusters/brusnika-stage/kustomization.yaml @@ -17,6 +17,7 @@ resources: - ../../apps/reviews/brusnika-stage - ../../apps/attachments/brusnika-stage - ../../apps/issues/brusnika-stage + - ../../apps/inspections/brusnika-stage - ../../apps/system-log/brusnika-stage - ../../apps/projects/brusnika-stage - ../../apps/subscriptions/brusnika-stage