diff --git a/apps/comparisons/base/frontend.yaml b/apps/comparisons/base/frontend.yaml index fc878db..60c58a7 100644 --- a/apps/comparisons/base/frontend.yaml +++ b/apps/comparisons/base/frontend.yaml @@ -36,7 +36,7 @@ spec: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/comparisons-frontend:prod_6dc6e0c2 + _default: cr.yandex/crp3ccidau046kdj8g9q/comparisons-frontend:contour_0570a1f1 pullPolicy: _default: IfNotPresent diff --git a/apps/comparisons/uralkal/backend.yaml b/apps/comparisons/uralkal/backend.yaml index 022e571..2ccfc8e 100644 --- a/apps/comparisons/uralkal/backend.yaml +++ b/apps/comparisons/uralkal/backend.yaml @@ -8,8 +8,101 @@ spec: values: services: backend: + image: + name: + _default: cr.yandex/crp3ccidau046kdj8g9q/comparisons-api-v2:contour_9a2bab4e + deployment: + port: + _default: 8080 + + args: + _default: + - | + set -a + [ -f /vault/secrets/comparisons-db ] && . /vault/secrets/comparisons-db + [ -f /vault/secrets/comparisons-jwt-public ] && export AUTH_PUBLIC_KEY="$(cat /vault/secrets/comparisons-jwt-public)" + set +a + cd /opt/comparisons + ./migrations up + exec ./api + resources: requests: cpu: null memory: null + + probes: + liveness: + httpGet: + port: + _default: 8080 + readiness: + httpGet: + port: + _default: 8080 + + service: + targetPort: + _default: 8080 + + envs: + - name: APP_NAME + value: + _default: "comparisons-api-v2" + + - name: APP_VERSION + value: + _default: "0.0.1" + + - name: LOGGER_LOG_LEVEL + value: + _default: "info" + + - name: DATABASE_NAME + value: + _default: "postgres" + + - name: HTTP_PORT + value: + _default: "8080" + + - name: DOCUMENTATIONS_INTERNAL_HOST + value: + _default: "http://backend-api-svc.documentations.svc.cluster.local" + + - name: DOCUMENTATIONS_EXTERNAL_HOST + value: + _default: "https://sarex.local.uralkali.com/documentations" + + - name: WORKFLOWS_HOST + value: + _default: "http://backend-svc.processing.svc.cluster.local" + + - name: WORKFLOWS_IMAGE_VERSION + value: + _default: "master" + + - name: WORKFLOWS_DJANGO_HOST + value: + _default: "https://sarex.local.uralkali.com" + + - name: WORKFLOWS_BIMV2_INTERNAL_HOST + value: + _default: "http://backend-svc.bim.svc.cluster.local" + + - name: WORKSPACES_HOST + value: + _default: "http://backend-svc.workspaces.svc.cluster.local" + + - name: EAV_HOST + value: + _default: "http://backend-svc.eav.svc.cluster.local" + + - name: ABAP_FIXED_CONC + value: + _default: "0" + + - name: WORKFLOWS_CONFIG_FILEPATH + value: + _default: "/etc/app/tasks-execution-config.json" diff --git a/infrastructure/istio-config/uralkal/istio-config.yaml b/infrastructure/istio-config/uralkal/istio-config.yaml index 9fcbf6e..3cc5e97 100644 --- a/infrastructure/istio-config/uralkal/istio-config.yaml +++ b/infrastructure/istio-config/uralkal/istio-config.yaml @@ -350,6 +350,32 @@ spec: rewrite: / service: frontend-svc.reviews.svc.cluster.local port: 80 + comparisons-api: + name: comparisons-api-virt-service + namespace: default + hosts: + - sarex.local.uralkali.com + gateways: + - default/platform-gateway + routes: + - path: + prefix: /comparisons/api/ + rewrite: /api/ + service: backend-service.comparisons.svc.cluster.local + port: 8000 + comparisons-frontend: + name: comparisons-frontend-virt-service + namespace: default + hosts: + - sarex.local.uralkali.com + gateways: + - default/platform-gateway + routes: + - path: + prefix: /comparisons/static/ + rewrite: / + service: frontend-service.comparisons.svc.cluster.local + port: 80 eav-api: name: eav-api-virt-service namespace: default