From c36406209fa82354233d4a5a50c5f14360c8efa4 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 24 Oct 2026 12:01:25 +0500 Subject: [PATCH] issues: SAREX_API from env, in-cluster Django in uralkal, vad, ugmk The base production.py hardcoded SAREX_API = https://srx.wb.ru, ignoring the env, so issue export (GET /api/core/users//) failed from closed contours with CERTIFICATE_VERIFY_FAILED. Read it from SAREX_API with the old value as default; wb keeps it. uralkal, vad, d8-ugmk-prod: SAREX_API -> backend-svc.django:80 (server-side calls, no TLS), and SAREX_HOST set to the contour's public host so links in exports and notifications stay external. --- apps/issues/base/production-configmap.yaml | 2 +- apps/issues/d8-ugmk-prod/backend-s3.yaml | 4 ++++ apps/issues/d8-ugmk-prod/celery-s3.yaml | 4 ++++ apps/issues/uralkal/backend-s3.yaml | 6 +++++- apps/issues/uralkal/celery-s3.yaml | 6 +++++- apps/issues/vad/backend-s3.yaml | 6 +++++- apps/issues/vad/celery-s3.yaml | 6 +++++- 7 files changed, 29 insertions(+), 5 deletions(-) diff --git a/apps/issues/base/production-configmap.yaml b/apps/issues/base/production-configmap.yaml index 162690d..c1ba469 100644 --- a/apps/issues/base/production-configmap.yaml +++ b/apps/issues/base/production-configmap.yaml @@ -122,7 +122,7 @@ data: "PUT", ] - SAREX_API = "https://srx.wb.ru" + SAREX_API = os.getenv("SAREX_API", "https://srx.wb.ru") AERO_PUBLIC_HOST = os.getenv("AERO_PUBLIC_HOST", default=SAREX_API) diff --git a/apps/issues/d8-ugmk-prod/backend-s3.yaml b/apps/issues/d8-ugmk-prod/backend-s3.yaml index d45299b..2450c76 100644 --- a/apps/issues/d8-ugmk-prod/backend-s3.yaml +++ b/apps/issues/d8-ugmk-prod/backend-s3.yaml @@ -108,6 +108,10 @@ spec: # там SAREX_API переприсваивается после `from .base import *`. # См. apps/issues/d8-ugmk-prod/production-configmap.yaml (INFRA-3005). - name: SAREX_API + value: + _default: "http://backend-svc.django.svc.cluster.local:80" + + - name: SAREX_HOST value: _default: "https://sarex.uralmine.com" diff --git a/apps/issues/d8-ugmk-prod/celery-s3.yaml b/apps/issues/d8-ugmk-prod/celery-s3.yaml index 6de7672..b7a66f9 100644 --- a/apps/issues/d8-ugmk-prod/celery-s3.yaml +++ b/apps/issues/d8-ugmk-prod/celery-s3.yaml @@ -102,6 +102,10 @@ spec: # Реально действует значение из production-configmap, см. там. - name: SAREX_API + value: + _default: "http://backend-svc.django.svc.cluster.local:80" + + - name: SAREX_HOST value: _default: "https://sarex.uralmine.com" diff --git a/apps/issues/uralkal/backend-s3.yaml b/apps/issues/uralkal/backend-s3.yaml index 0bf8a3c..0d583fb 100644 --- a/apps/issues/uralkal/backend-s3.yaml +++ b/apps/issues/uralkal/backend-s3.yaml @@ -96,7 +96,11 @@ spec: - name: SAREX_API value: - _default: "https://sarex.contour.infra.sarex.tech" + _default: "http://backend-svc.django.svc.cluster.local:80" + + - name: SAREX_HOST + value: + _default: "https://sarex.local.uralkali.com" - name: DOCUMENTATIONS_URL value: diff --git a/apps/issues/uralkal/celery-s3.yaml b/apps/issues/uralkal/celery-s3.yaml index 5c0e3f8..62359c8 100644 --- a/apps/issues/uralkal/celery-s3.yaml +++ b/apps/issues/uralkal/celery-s3.yaml @@ -96,7 +96,11 @@ spec: - name: SAREX_API value: - _default: "https://srx.wb.ru" + _default: "http://backend-svc.django.svc.cluster.local:80" + + - name: SAREX_HOST + value: + _default: "https://sarex.local.uralkali.com" - name: DOCUMENTATIONS_URL value: diff --git a/apps/issues/vad/backend-s3.yaml b/apps/issues/vad/backend-s3.yaml index a84b217..3a411cc 100644 --- a/apps/issues/vad/backend-s3.yaml +++ b/apps/issues/vad/backend-s3.yaml @@ -96,7 +96,11 @@ spec: - name: SAREX_API value: - _default: "https://sarex.contour.infra.sarex.tech" + _default: "http://backend-svc.django.svc.cluster.local:80" + + - name: SAREX_HOST + value: + _default: "https://sarex.vadroad.ru" - name: DOCUMENTATIONS_URL value: diff --git a/apps/issues/vad/celery-s3.yaml b/apps/issues/vad/celery-s3.yaml index 57dd8c2..90bcbd1 100644 --- a/apps/issues/vad/celery-s3.yaml +++ b/apps/issues/vad/celery-s3.yaml @@ -96,7 +96,11 @@ spec: - name: SAREX_API value: - _default: "https://srx.wb.ru" + _default: "http://backend-svc.django.svc.cluster.local:80" + + - name: SAREX_HOST + value: + _default: "https://sarex.vadroad.ru" - name: DOCUMENTATIONS_URL value: