Add Redis applications to ArgoCD using universal-chart Helm configuration across multiple namespaces (django, pm, documentations); update kustomization references.

README.md

@@ -1,349 +1,7 @@
-# FluxCD v2 Monorepooo
+# FluxCD v2 Monorepo
 
 Репозиторий Infrastructure as Code, управляемый [FluxCD v2](https://fluxcd.io/) с использованием Kustomize-оверлеев и Helm-релизов.
 
-## Карта инфраструктуры и межсервисных маршрутов
-
-Диаграмма ниже показывает инфраструктурные компоненты кластера, их зависимости и типовые маршруты вызовов между бизнес-сервисами.
-
-```mermaid
-flowchart LR
-    %% ===== Внешний контур =====
-    User([👤 Пользователь<br/>Web / Mobile]):::ext
-    Admin([🛡 Администратор<br/>kubectl / flux]):::ext
-    LE([🔐 Let's Encrypt<br/>ACME v2]):::ext
-    GitRepo([📦 Git Repository<br/>FluxCD source]):::ext
-    OCI([🐳 OCI Registry<br/>cr.yandex]):::ext
-
-    %% ===== GitOps =====
-    subgraph GITOPS["⚙️ GitOps Control Plane"]
-        direction TB
-        FluxSource[source-controller]:::flux
-        FluxKust[kustomize-controller]:::flux
-        FluxHelm[helm-controller]:::flux
-        FluxNotif[notification-controller]:::flux
-        FluxSource --> FluxKust
-        FluxSource --> FluxHelm
-        FluxKust --> FluxNotif
-        FluxHelm --> FluxNotif
-    end
-
-    %% ===== Edge / Service Mesh =====
-    subgraph EDGE["🌐 Edge & Service Mesh — istio-system"]
-        direction TB
-        Gateway["Istio Gateway<br/>:443 / :80<br/>LoadBalancer"]:::mesh
-        Pilot["istiod / Pilot<br/>xDS :15010/:15012"]:::mesh
-        Base[Istio Base<br/>CRDs + RBAC]:::mesh
-        Cert["cert-manager<br/>v1.x"]:::mesh
-        IssuerProd[ClusterIssuer<br/>letsencrypt-prod]:::mesh
-        IssuerIstio[ClusterIssuer<br/>letsencrypt-istio]:::mesh
-        Pilot -->|sidecar inject| Gateway
-        Base --> Pilot
-        Cert --> IssuerProd
-        Cert --> IssuerIstio
-        IssuerIstio -. TLS cert .-> Gateway
-    end
-
-    %% ===== Платформа =====
-    subgraph PLATFORM["🛠 Платформа"]
-        direction TB
-        Dashboard["K8s Dashboard<br/>UI :8443"]:::platform
-        LPP["local-path-provisioner<br/>StorageClass: local-path"]:::platform
-        Vault["HashiCorp Vault<br/>:8200 KV/Transit"]:::platform
-        S3Proxy["S3 Proxy<br/>S3 API gateway"]:::platform
-    end
-
-    %% ===== Identity =====
-    subgraph IDENTITY["🪪 Identity & SSO"]
-        direction TB
-        Zitadel["Zitadel<br/>OIDC :8080"]:::identity
-        Keycloak["Keycloak<br/>OIDC/SAML :8080"]:::identity
-        OpenLDAP["OpenLDAP<br/>:389 / :636"]:::identity
-        Keycloak -- "LDAP federation" --> OpenLDAP
-    end
-
-    %% ===== Данные =====
-    subgraph DATA["🗄 Хранилища данных"]
-        direction TB
-        PG[("PostgreSQL<br/>:5432<br/>HA primary/replica")]:::data
-        Redis[("Redis<br/>:6379<br/>cache + pub/sub")]:::data
-        MinIO[("MinIO<br/>S3 :9000<br/>console :9001")]:::data
-    end
-
-    %% ===== Messaging =====
-    subgraph MSG["📨 Messaging"]
-        direction TB
-        Kafka[["Kafka<br/>:9092 / :9093 SASL<br/>3 brokers"]]:::msg
-        ZK[["ZooKeeper / KRaft<br/>:2181"]]:::msg
-        RMQ[["RabbitMQ<br/>:5672 / mgmt :15672"]]:::msg
-        Kafka --- ZK
-    end
-
-    %% ===== BPM =====
-    subgraph BPM["🔧 BPM"]
-        direction TB
-        Camunda["Camunda Platform<br/>REST :8080 / Tasklist"]:::app
-        Operate["Camunda Operate<br/>UI :8081"]:::app
-    end
-
-    %% ===== Бизнес-сервисы (каждый в своём namespace) =====
-    subgraph APPS["💼 Бизнес-сервисы — namespaces"]
-        direction LR
-        CI["ns: control-interface"]:::app
-        Django["ns: django"]:::app
-        EAV["ns: eav"]:::app
-        Workspaces["ns: workspaces"]:::app
-        Projects["ns: projects"]:::app
-        PM["ns: pm"]:::app
-        Contracts["ns: contracts"]:::app
-        Resources["ns: resources"]:::app
-        Subs["ns: subscriptions"]:::app
-        SysLog["ns: system-log"]:::app
-        MsgHub["ns: message-hub"]:::app
-        FaaS["ns: faas"]:::app
-        Flows["ns: flows"]:::app
-        Docs["ns: documentations"]:::app
-        DocLink["ns: document-link"]:::app
-        Attach["ns: attachments"]:::app
-        Transmittal["ns: transmittal"]:::app
-        CDE["ns: cde"]:::app
-        Drawings["ns: drawings"]:::app
-        BIM["ns: bim"]:::app
-        Stamp["ns: stamp-verification"]:::app
-        Inspect["ns: inspections"]:::app
-        Checklists["ns: checklists"]:::app
-        Remarks["ns: remarks"]:::app
-        Issues["ns: issues"]:::app
-        RFI["ns: rfi"]:::app
-        Reviews["ns: reviews"]:::app
-        Prescr["ns: prescriptions"]:::app
-        Compare["ns: comparisons"]:::app
-        Measure["ns: measurements"]:::app
-        Mapper["ns: mapper"]:::app
-        XSection["ns: cross-section"]:::app
-        Process["ns: processing"]:::app
-        Notes["ns: notes"]:::app
-    end
-
-    %% ===== GitOps потоки =====
-    Admin ==>|git push| GitRepo
-    GitRepo ==>|pull/poll| FluxSource
-    OCI ==>|OCI charts| FluxSource
-    FluxKust ==>|apply manifests| EDGE
-    FluxKust ==>|apply manifests| PLATFORM
-    FluxKust ==>|apply manifests| IDENTITY
-    FluxHelm ==>|HelmRelease| DATA
-    FluxHelm ==>|HelmRelease| MSG
-    FluxHelm ==>|HelmRelease| BPM
-    FluxHelm ==>|HelmRelease| APPS
-
-    %% ===== Внешний трафик =====
-    User ==>|HTTPS 443| Gateway
-    LE -. ACME HTTP-01 .-> Cert
-    Gateway ==>|VirtualService<br/>mTLS| CI
-    Gateway ==>|/api| Django
-    Gateway ==>|/bim| BIM
-    Gateway ==>|/cde| CDE
-    Gateway ==>|/docs| Docs
-    Gateway ==>|/pm| PM
-    Gateway ==>|VirtualService| Camunda
-    Gateway ==>|VirtualService| Operate
-    Gateway ==>|/auth| Keycloak
-    Gateway ==>|/oauth| Zitadel
-    Gateway ==>|/dashboard| Dashboard
-    Gateway ==>|/minio| MinIO
-    Admin -.->|kubectl| Dashboard
-
-    %% ===== Frontend → backend (через control-interface) =====
-    CI -- "API gateway" --> Django
-    CI -- "API gateway" --> PM
-    CI -- "API gateway" --> Projects
-    CI -- "API gateway" --> Workspaces
-
-    %% ===== Подключения к данным =====
-    Django -- "JDBC/ORM" --> PG
-    EAV -- "JDBC" --> PG
-    PM -- "JDBC" --> PG
-    Contracts -- "JDBC" --> PG
-    Resources -- "JDBC" --> PG
-    Projects -- "JDBC" --> PG
-    Workspaces -- "JDBC" --> PG
-    Subs -- "JDBC" --> PG
-    SysLog -- "JDBC" --> PG
-    Docs -- "JDBC" --> PG
-    DocLink -- "JDBC" --> PG
-    CDE -- "JDBC" --> PG
-    BIM -- "JDBC" --> PG
-    Drawings -- "JDBC" --> PG
-    Inspect -- "JDBC" --> PG
-    Checklists -- "JDBC" --> PG
-    Issues -- "JDBC" --> PG
-    Remarks -- "JDBC" --> PG
-    RFI -- "JDBC" --> PG
-    Reviews -- "JDBC" --> PG
-    Prescr -- "JDBC" --> PG
-    Compare -- "JDBC" --> PG
-    Measure -- "JDBC" --> PG
-    Mapper -- "JDBC" --> PG
-    XSection -- "JDBC" --> PG
-    Notes -- "JDBC" --> PG
-    Stamp -- "JDBC" --> PG
-    Transmittal -- "JDBC" --> PG
-    Camunda -- "JDBC" --> PG
-    Operate -- "JDBC" --> PG
-    Zitadel -- "JDBC" --> PG
-    Keycloak -- "JDBC" --> PG
-
-    %% ===== Redis (общий кэш / sessions) =====
-    Django -- "session/cache" --> Redis
-    CI -- "session" --> Redis
-    PM -- "cache" --> Redis
-    Workspaces -- "cache" --> Redis
-    Subs -- "pub/sub realtime" --> Redis
-    MsgHub -- "pub/sub" --> Redis
-    Flows -- "state" --> Redis
-    FaaS -- "queue" --> Redis
-    Camunda -- "cache" --> Redis
-    Keycloak -- "session" --> Redis
-
-    %% ===== S3 / объектное хранилище =====
-    Attach -- "PUT/GET" --> S3Proxy
-    Docs -- "filestream" --> S3Proxy
-    BIM -- "IFC/RVT" --> S3Proxy
-    Drawings -- "DWG/PDF" --> S3Proxy
-    CDE -- "files" --> S3Proxy
-    Compare -- "rendered diff" --> S3Proxy
-    Stamp -- "signed PDF" --> S3Proxy
-    Transmittal -- "bundles" --> S3Proxy
-    Process -- "raw + результаты" --> S3Proxy
-    Mapper -- "tiles" --> S3Proxy
-    Measure -- "snapshots" --> S3Proxy
-    XSection -- "профили" --> S3Proxy
-    S3Proxy -- "S3 API" --> MinIO
-
-    %% ===== Vault (secrets) =====
-    Django -. "kv" .-> Vault
-    Camunda -. "approle" .-> Vault
-    Keycloak -. "kv" .-> Vault
-    Zitadel -. "kv" .-> Vault
-    FaaS -. "approle" .-> Vault
-    Flows -. "approle" .-> Vault
-
-    %% ===== Storage / PVC =====
-    PG -.->|PVC| LPP
-    Redis -.->|PVC| LPP
-    Kafka -.->|PVC| LPP
-    ZK -.->|PVC| LPP
-    RMQ -.->|PVC| LPP
-    MinIO -.->|PVC| LPP
-    Vault -.->|PVC| LPP
-
-    %% ===== Kafka (event bus) =====
-    SysLog -- "consume audit.*" --> Kafka
-    MsgHub -- "produce notify.*" --> Kafka
-    Subs -- "consume notify.*" --> Kafka
-    Flows -- "produce/consume flows.*" --> Kafka
-    Camunda -- "produce bpm.events" --> Kafka
-    Operate -- "consume zeebe-records" --> Kafka
-    BIM -- "produce bim.processed" --> Kafka
-    Drawings -- "produce drawings.uploaded" --> Kafka
-    Process -- "consume processing.jobs" --> Kafka
-    Compare -- "consume drawings.uploaded" --> Kafka
-    Inspect -- "produce inspect.events" --> Kafka
-    Issues -- "consume inspect.events" --> Kafka
-    Remarks -- "produce remarks.events" --> Kafka
-    Reviews -- "consume remarks.events" --> Kafka
-
-    %% ===== RabbitMQ (work queues) =====
-    FaaS -- "consume tasks.*" --> RMQ
-    Flows -- "publish tasks.*" --> RMQ
-    Process -- "publish jobs" --> RMQ
-    Mapper -- "consume tile.jobs" --> RMQ
-    XSection -- "consume xs.jobs" --> RMQ
-    Stamp -- "consume sign.jobs" --> RMQ
-    Camunda -- "consume bpm.tasks" --> RMQ
-
-    %% ===== Межсервисные REST маршруты =====
-    PM -- "REST" --> Projects
-    PM -- "REST" --> Contracts
-    PM -- "REST" --> Resources
-    Projects -- "REST" --> Workspaces
-    Contracts -- "REST" --> Resources
-    Inspect -- "REST" --> Checklists
-    Inspect -- "REST" --> Issues
-    Issues -- "REST" --> Remarks
-    Reviews -- "REST" --> RFI
-    Reviews -- "REST" --> Prescr
-    RFI -- "REST" --> DocLink
-    DocLink --> Docs
-    DocLink --> CDE
-    CDE -- "REST" --> Docs
-    CDE -- "REST" --> Drawings
-    CDE -- "REST" --> BIM
-    Transmittal -- "REST" --> CDE
-    Transmittal -- "REST" --> Docs
-    Drawings -- "REST" --> Compare
-    Drawings -- "REST" --> Stamp
-    Measure -- "REST" --> Mapper
-    Mapper -- "REST" --> XSection
-    XSection --> Process
-    BIM -- "REST" --> Process
-    Notes -- "REST" --> DocLink
-    Flows -- "trigger" --> FaaS
-    Flows -- "start" --> Camunda
-    Camunda -- "callback" --> Flows
-    EAV -- "schemas" --> Django
-    MsgHub -- "deliver email/push" --> Subs
-
-    %% ===== AuthN / AuthZ =====
-    Django -. "OIDC validate" .-> Keycloak
-    CI -. "OIDC login" .-> Keycloak
-    PM -. "JWT" .-> Keycloak
-    Camunda -. "JWT" .-> Zitadel
-    Operate -. "OIDC" .-> Zitadel
-    Dashboard -. "OIDC" .-> Keycloak
-    BIM -. "JWT" .-> Keycloak
-    CDE -. "JWT" .-> Keycloak
-    Docs -. "JWT" .-> Keycloak
-
-    %% ===== Service mesh sidecar metrics =====
-    CI -. "envoy" .-> Pilot
-    Django -. "envoy" .-> Pilot
-    Camunda -. "envoy" .-> Pilot
-    BIM -. "envoy" .-> Pilot
-    Flows -. "envoy" .-> Pilot
-
-
-    %% ===== Стили =====
-    classDef ext fill:#1f2937,stroke:#9ca3af,stroke-width:2px,color:#f9fafb
-    classDef flux fill:#6366f1,stroke:#3730a3,stroke-width:2px,color:#fff
-    classDef mesh fill:#7c3aed,stroke:#4c1d95,stroke-width:2px,color:#fff
-    classDef platform fill:#0ea5e9,stroke:#075985,stroke-width:2px,color:#fff
-    classDef identity fill:#f59e0b,stroke:#92400e,stroke-width:2px,color:#fff
-    classDef data fill:#10b981,stroke:#065f46,stroke-width:2px,color:#fff
-    classDef msg fill:#ef4444,stroke:#991b1b,stroke-width:2px,color:#fff
-    classDef app fill:#ec4899,stroke:#9d174d,stroke-width:2px,color:#fff
-
-    style GITOPS fill:#e0e7ff,stroke:#6366f1,stroke-width:2px
-    style EDGE fill:#ede9fe,stroke:#7c3aed,stroke-width:2px
-    style PLATFORM fill:#e0f2fe,stroke:#0ea5e9,stroke-width:2px
-    style IDENTITY fill:#fef3c7,stroke:#f59e0b,stroke-width:2px
-    style DATA fill:#d1fae5,stroke:#10b981,stroke-width:2px
-    style MSG fill:#fee2e2,stroke:#ef4444,stroke-width:2px
-    style BPM fill:#fce7f3,stroke:#ec4899,stroke-width:2px
-    style APPS fill:#fce7f3,stroke:#ec4899,stroke-width:2px
-```
-
-📂 **Подробные диаграммы по каждому бизнес-сервису:** [`docs/apps/`](./docs/apps/README.md)
-
-**Легенда:**
-- 🟪 **Edge / Mesh** — терминация TLS, маршрутизация и mTLS между сервисами (Istio + cert-manager)
-- 🟦 **Платформа** — служебные компоненты (storage, secrets, S3 proxy, dashboard)
-- 🟧 **Identity** — единый вход и федерация пользователей (Zitadel, Keycloak, OpenLDAP)
-- 🟩 **Данные** — постоянные хранилища (PostgreSQL, Redis, MinIO)
-- 🟥 **Messaging** — асинхронный обмен (Kafka, RabbitMQ)
-- 🟪 **Бизнес-сервисы** — прикладная логика (Camunda, бизнес-приложения)
-
 ## Структура репозитория
 
 ```

apps/attachments/base/deployment.yaml

@@ -0,0 +1,70 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: attachments
+  namespace: attachments
+  labels:
+    app: attachments
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: attachments
+  template:
+    metadata:
+      labels:
+        app: attachments
+      annotations:
+        traffic.sidecar.istio.io/excludeOutboundPorts: "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: attachments
+        vault.hashicorp.com/agent-inject-secret-attachments-db: secrets/data/postgresql/apps/attachments
+        vault.hashicorp.com/agent-inject-template-attachments-db: |-
+          {{- with secret "secrets/data/postgresql/apps/attachments" -}}
+          DATABASE_HOST=postgresql.attachments.svc.cluster.local
+          DATABASE_PORT=5432
+          DATABASE_NAME=attachments_db
+          DATABASE_USER={{ index .Data.data "username" }}
+          DATABASE_PASSWORD={{ index .Data.data "password" }}
+          DATABASE_SSL_MODE=disable
+          {{- end -}}
+        vault.hashicorp.com/agent-inject-secret-attachments-s3: secrets/data/minio/apps/attachments
+        vault.hashicorp.com/agent-inject-template-attachments-s3: |-
+          {{- with secret "secrets/data/minio/apps/attachments" -}}
+          YANDEX_S3_ENDPOINT_URL=minio.minio:9000
+          YANDEX_S3_ACCESS_KEY_ID={{ index .Data.data "access_key" }}
+          YANDEX_S3_SECRET_ACCESS_KEY={{ index .Data.data "secret_key" }}
+          YANDEX_S3_USE_SSL=false
+          YANDEX_S3_REGION=ru-central
+          YANDEX_S3_VERIFY=false
+          BUCKET_NAME=attachments
+          {{- end -}}
+    spec:
+      serviceAccountName: attachments-vault
+      containers:
+        - name: attachments
+          image: cr.yandex/crp3ccidau046kdj8g9q/attachments:feature_6238c882
+          imagePullPolicy: IfNotPresent
+          command: ["/bin/bash", "-ec"]
+          args:
+            - |
+              set -a
+              [ -f /vault/secrets/attachments-db ] && . /vault/secrets/attachments-db
+              [ -f /vault/secrets/attachments-s3 ] && . /vault/secrets/attachments-s3
+              set +a
+              exec /opt/attachments/entrypoint.sh
+          ports:
+            - name: http
+              containerPort: 8000
+              protocol: TCP
+          env:
+            - name: POSTGRES_POOL_SIZE
+              value: "10"
+            - name: API_ADDRESS
+              value: 0.0.0.0:8000
+      imagePullSecrets:
+        - name: regcred

apps/attachments/base/helmrelease.yaml

@@ -1,110 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: attachments
-  namespace: attachments
-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:
-      attachments:
-        enabled: true
-        serviceAccount:
-          enabled:
-            _default: true
-          name:
-            _default: attachments-vault
-        deployment:
-          enabled: true
-          name:
-            _default: attachments
-          replicaCount:
-            _default: 1
-          port:
-            _default: 8000
-          command:
-            _default: ["/bin/bash", "-ec"]
-          args:
-            _default:
-              - |
-                set -a
-                [ -f /vault/secrets/attachments-db ] && . /vault/secrets/attachments-db
-                [ -f /vault/secrets/attachments-s3 ] && . /vault/secrets/attachments-s3
-                set +a
-                exec /opt/attachments/entrypoint.sh
-        image:
-          name:
-            _default: cr.yandex/crp3ccidau046kdj8g9q/attachments:feature_6238c882
-          pullPolicy:
-            _default: IfNotPresent
-        service:
-          enabled: true
-          name:
-            _default: attachments-service
-          type:
-            _default: ClusterIP
-          port:
-            _default: 8000
-          targetPort:
-            _default: 8000
-          portName:
-            _default: http
-        imagePullSecrets:
-          enabled:
-            _default: true
-          name:
-            _default: regcred
-        envs:
-          - name: POSTGRES_POOL_SIZE
-            value:
-              _default: "10"
-          - name: API_ADDRESS
-            value:
-              _default: 0.0.0.0:8000
-        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: attachments
-            vault.hashicorp.com/agent-inject-secret-attachments-db: secrets/data/postgresql/apps/attachments
-            vault.hashicorp.com/agent-inject-template-attachments-db: |-
-              {{- with secret "secrets/data/postgresql/apps/attachments" -}}
-              DATABASE_HOST=postgresql.attachments.svc.cluster.local
-              DATABASE_PORT=5432
-              DATABASE_NAME=attachments_db
-              DATABASE_USER={{ index .Data.data "username" }}
-              DATABASE_PASSWORD={{ index .Data.data "password" }}
-              DATABASE_SSL_MODE=disable
-              {{- end -}}
-            vault.hashicorp.com/agent-inject-secret-attachments-s3: secrets/data/minio/apps/attachments
-            vault.hashicorp.com/agent-inject-template-attachments-s3: |-
-              {{- with secret "secrets/data/minio/apps/attachments" -}}
-              YANDEX_S3_ENDPOINT_URL=minio.minio:9000
-              YANDEX_S3_ACCESS_KEY_ID={{ index .Data.data "access_key" }}
-              YANDEX_S3_SECRET_ACCESS_KEY={{ index .Data.data "secret_key" }}
-              YANDEX_S3_USE_SSL=false
-              YANDEX_S3_REGION=ru-central
-              YANDEX_S3_VERIFY=false
-              BUCKET_NAME=attachments
-              {{- end -}}

apps/attachments/base/kustomization.yaml

@@ -3,4 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: attachments
 resources:
-  - helmrelease.yaml
+  - namespace.yaml
+  - serviceaccount.yaml
+  - deployment.yaml
+  - service.yaml

apps/attachments/base/namespace.yaml

@@ -2,6 +2,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: transmittal
+  name: attachments
   labels:
     istio-injection: enabled

apps/attachments/base/service.yaml

@@ -2,14 +2,13 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: backend-svc
+  name: attachments-service
-  namespace: transmittal
+  namespace: attachments
 spec:
   type: ClusterIP
   selector:
-    app: backend
+    app: attachments
   ports:
-    - name: http
+    - port: 8000
-      port: 80
       targetPort: 8000
       protocol: TCP

apps/attachments/base/serviceaccount.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: attachments-vault
+  namespace: attachments

apps/attachments/yc-k8s-test/kustomization.yaml

@@ -4,8 +4,8 @@ kind: Kustomization
 resources:
   - ../base
   - postgresql.yaml
-patches: []
+patches:
-#  - path: replicas.yaml
+  - path: replicas.yaml
-#    target:
+    target:
-#      kind: HelmRelease
+      kind: Deployment
-#      name: attachments
+      name: attachments

apps/attachments/yc-k8s-test/postgresql.yaml

@@ -89,10 +89,6 @@ spec:
         timeoutSeconds: 5
         successThreshold: 1
         failureThreshold: 6
-      resources:
-        requests:
-          cpu: 50m
-          memory: 128Mi
       nodeSelector:
         dedicated: db
       tolerations:

apps/attachments/yc-k8s-test/replicas.yaml

@@ -1,13 +1,8 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2
+apiVersion: apps/v1
-kind: HelmRelease
+kind: Deployment
 metadata:
   name: attachments
   namespace: attachments
 spec:
-  values:
+  replicas: 1
-    services:
-      attachments:
-        deployment:
-          replicaCount:
-            _default: 2

apps/bim/base/backend-deployment.yaml

@@ -50,7 +50,7 @@ spec:
       serviceAccountName: bim-vault
       containers:
         - name: backend
-          image: cr.yandex/crp3ccidau046kdj8g9q/bim-api:contour_3d704fef
+          image: cr.yandex/crp3ccidau046kdj8g9q/bim-backend-v2:donstroi1
           imagePullPolicy: IfNotPresent
           command: ["/bin/sh", "-ec"]
           args:
@@ -58,7 +58,7 @@ spec:
               set -a
               [ -f /vault/secrets/bim-postgresql ] && . /vault/secrets/bim-postgresql
               set +a
-              exec ./httpserver
+              exec ./entrypoint.sh
           ports:
             - name: http
               containerPort: 8000
@@ -88,7 +88,7 @@ spec:
               value: "0"
           resources:
             requests:
-              cpu: 25m
+              cpu: 100m
               memory: 100Mi
           livenessProbe:
             httpGet:

apps/bim/base/backend-service.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: backend-svc
+  name: backend-service
   namespace: bim
 spec:
   type: ClusterIP
@@ -10,6 +10,6 @@ spec:
     app: backend
   ports:
     - name: http
-      port: 80
+      port: 8000
       targetPort: 8000
       protocol: TCP

apps/bim/yc-k8s-test/postgresql.yaml

@@ -92,8 +92,7 @@ spec:
         failureThreshold: 6
       resources:
         requests:
-          cpu: 50m
+          memory: 512Mi
-          memory: 128Mi
       nodeSelector:
         dedicated: db
       tolerations:

apps/cde/base/cde-flowscallback.yaml

@@ -17,34 +17,11 @@ spec:
       labels:
         app: cde-flowscallback
         service: cde-flowscallback
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: "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: cde
-        vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde
-        vault.hashicorp.com/agent-inject-template-cde-env: |-
-          {{- with secret "secrets/data/vault/apps/cde" -}}
-          {{- range $k, $v := .Data.data }}
-          export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }})
-          {{- end }}
-          {{- end -}}
     spec:
-      serviceAccountName: cde-vault
       containers:
         - name: cde-flowscallback
-          image: cr.yandex/crp3ccidau046kdj8g9q/flowscallback-worker:prod_9f3c1d2a
+          image: cr.yandex/crp3ccidau046kdj8g9q/flowscallback-worker:prod_3.1.2
           imagePullPolicy: IfNotPresent
-          command:
-            - /bin/bash
-            - -lc
-          args:
-            - |
-              set -e
-              source /vault/secrets/cde-env
-              exec /worker
           ports:
             - name: http
               containerPort: 8000
@@ -52,9 +29,12 @@ spec:
           env:
             - name: S3_IS_CONTOUR
               value: "true"
+          envFrom:
+          - secretRef:
+              name: cde-secret
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/cde/base/cde-splitpdf.yaml

@@ -17,34 +17,11 @@ spec:
       labels:
         app: cde-splitpdf
         service: cde-splitpdf
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: "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: cde
-        vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde
-        vault.hashicorp.com/agent-inject-template-cde-env: |-
-          {{- with secret "secrets/data/vault/apps/cde" -}}
-          {{- range $k, $v := .Data.data }}
-          export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }})
-          {{- end }}
-          {{- end -}}
     spec:
-      serviceAccountName: cde-vault
       containers:
         - name: cde-splitpdf
-          image: cr.yandex/crp3ccidau046kdj8g9q/splitpdf-worker:prod_9f3c1d2a
+          image: cr.yandex/crp3ccidau046kdj8g9q/splitpdf-worker:prod_3.1.2
           imagePullPolicy: IfNotPresent
-          command:
-            - /bin/bash
-            - -lc
-          args:
-            - |
-              set -e
-              source /vault/secrets/cde-env
-              exec /worker
           ports:
             - name: http
               containerPort: 8000
@@ -52,9 +29,12 @@ spec:
           env:
             - name: S3_IS_CONTOUR
               value: "true"
+          envFrom:
+          - secretRef:
+              name: cde-secret
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/cde/base/cde-worker-copy.yaml

@@ -17,34 +17,11 @@ spec:
       labels:
         app: cde-worker-copy
         service: cde-worker-copy
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: "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: cde
-        vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde
-        vault.hashicorp.com/agent-inject-template-cde-env: |-
-          {{- with secret "secrets/data/vault/apps/cde" -}}
-          {{- range $k, $v := .Data.data }}
-          export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }})
-          {{- end }}
-          {{- end -}}
     spec:
-      serviceAccountName: cde-vault
       containers:
         - name: cde-worker-copy
-          image: cr.yandex/crp3ccidau046kdj8g9q/copy-worker:prod_9f3c1d2a
+          image: cr.yandex/crp3ccidau046kdj8g9q/copy-worker:preprod_fd483601
           imagePullPolicy: IfNotPresent
-          command:
-            - /bin/bash
-            - -lc
-          args:
-            - |
-              set -e
-              source /vault/secrets/cde-env
-              exec /worker
           ports:
             - name: http
               containerPort: 8000
@@ -52,9 +29,12 @@ spec:
           env:
             - name: S3_IS_CONTOUR
               value: "true"
+          envFrom:
+          - secretRef:
+              name: cde-secret
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/cde/base/cde-worker-create-versions.yaml

@@ -17,34 +17,11 @@ spec:
       labels:
         app: cde-worker-create-versions
         service: cde-worker-create-versions
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: "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: cde
-        vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde
-        vault.hashicorp.com/agent-inject-template-cde-env: |-
-          {{- with secret "secrets/data/vault/apps/cde" -}}
-          {{- range $k, $v := .Data.data }}
-          export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }})
-          {{- end }}
-          {{- end -}}
     spec:
-      serviceAccountName: cde-vault
       containers:
         - name: cde-worker-create-versions
-          image: cr.yandex/crp3ccidau046kdj8g9q/createversions-worker:prod_9f3c1d2a
+          image: cr.yandex/crp3ccidau046kdj8g9q/createversions-worker:preprod_ec474ae7
           imagePullPolicy: IfNotPresent
-          command:
-            - /bin/bash
-            - -lc
-          args:
-            - |
-              set -e
-              source /vault/secrets/cde-env
-              exec /worker
           ports:
             - name: http
               containerPort: 8000
@@ -52,9 +29,12 @@ spec:
           env:
             - name: S3_IS_CONTOUR
               value: "true"
+          envFrom:
+          - secretRef:
+              name: cde-secret
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/cde/base/cde-worker-markings.yaml

@@ -17,34 +17,11 @@ spec:
       labels:
         app: cde-worker-markings
         service: cde-worker-markings
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: "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: cde
-        vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde
-        vault.hashicorp.com/agent-inject-template-cde-env: |-
-          {{- with secret "secrets/data/vault/apps/cde" -}}
-          {{- range $k, $v := .Data.data }}
-          export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }})
-          {{- end }}
-          {{- end -}}
     spec:
-      serviceAccountName: cde-vault
       containers:
         - name: cde-worker-markings
-          image: cr.yandex/crp3ccidau046kdj8g9q/markings-worker:prod_9f3c1d2a
+          image: cr.yandex/crp3ccidau046kdj8g9q/markings-worker:preprod_eb50f30e
           imagePullPolicy: IfNotPresent
-          command:
-            - /bin/bash
-            - -lc
-          args:
-            - |
-              set -e
-              source /vault/secrets/cde-env
-              exec /worker
           ports:
             - name: http
               containerPort: 8000
@@ -52,9 +29,12 @@ spec:
           env:
             - name: S3_IS_CONTOUR
               value: "true"
+          envFrom:
+          - secretRef:
+              name: cde-secret
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/cde/base/cde-worker-sign.yaml

@@ -17,34 +17,11 @@ spec:
       labels:
         app: cde-worker-sign
         service: cde-worker-sign
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: "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: cde
-        vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde
-        vault.hashicorp.com/agent-inject-template-cde-env: |-
-          {{- with secret "secrets/data/vault/apps/cde" -}}
-          {{- range $k, $v := .Data.data }}
-          export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }})
-          {{- end }}
-          {{- end -}}
     spec:
-      serviceAccountName: cde-vault
       containers:
         - name: cde-worker-sign
-          image: cr.yandex/crp3ccidau046kdj8g9q/sign-worker:prod_9f3c1d2a
+          image: cr.yandex/crp3ccidau046kdj8g9q/sign-worker:preprod_fd483601
           imagePullPolicy: IfNotPresent
-          command:
-            - /bin/bash
-            - -lc
-          args:
-            - |
-              set -e
-              source /vault/secrets/cde-env
-              exec /worker
           ports:
             - name: http
               containerPort: 8000
@@ -52,9 +29,12 @@ spec:
           env:
             - name: S3_IS_CONTOUR
               value: "true"
+          envFrom:
+          - secretRef:
+              name: cde-secret
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/cde/base/cde-worker-update-bundles.yaml

@@ -17,34 +17,11 @@ spec:
       labels:
         app: cde-worker-update-bundles
         service: cde-worker-update-bundles
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: "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: cde
-        vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde
-        vault.hashicorp.com/agent-inject-template-cde-env: |-
-          {{- with secret "secrets/data/vault/apps/cde" -}}
-          {{- range $k, $v := .Data.data }}
-          export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }})
-          {{- end }}
-          {{- end -}}
     spec:
-      serviceAccountName: cde-vault
       containers:
         - name: cde-worker-update-bundles
-          image: cr.yandex/crp3ccidau046kdj8g9q/updatebundles-worker:prod_9f3c1d2a
+          image: cr.yandex/crp3ccidau046kdj8g9q/updatebundles-worker:prod_3.1.2
           imagePullPolicy: IfNotPresent
-          command:
-            - /bin/bash
-            - -lc
-          args:
-            - |
-              set -e
-              source /vault/secrets/cde-env
-              exec /worker
           ports:
             - name: http
               containerPort: 8000
@@ -52,9 +29,12 @@ spec:
           env:
             - name: S3_IS_CONTOUR
               value: "true"
+          envFrom:
+          - secretRef:
+              name: cde-secret
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/cde/base/cde.yaml

@@ -17,34 +17,11 @@ spec:
       labels:
         app: cde
         service: cde
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: "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: cde
-        vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde
-        vault.hashicorp.com/agent-inject-template-cde-env: |-
-          {{- with secret "secrets/data/vault/apps/cde" -}}
-          {{- range $k, $v := .Data.data }}
-          export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }})
-          {{- end }}
-          {{- end -}}
     spec:
-      serviceAccountName: cde-vault
       containers:
         - name: api
-          image: cr.yandex/crp3ccidau046kdj8g9q/cde:prod_9f3c1d2a
+          image: cr.yandex/crp3ccidau046kdj8g9q/cde:preprod_ec474ae7
           imagePullPolicy: IfNotPresent
-          command:
-            - /bin/bash
-            - -lc
-          args:
-            - |
-              set -e
-              source /vault/secrets/cde-env
-              exec /http
           ports:
             - name: http
               containerPort: 8000
@@ -52,9 +29,12 @@ spec:
           env:
             - name: S3_IS_CONTOUR
               value: "true"
+          envFrom:
+          - secretRef:
+              name: cde-secret
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/cde/base/kustomization.yaml

@@ -4,7 +4,6 @@ kind: Kustomization
 namespace: cde
 resources:
   - namespace.yaml
-  - serviceaccount.yaml
   - cde.yaml
   - cde-splitpdf.yaml
   - backend-service.yaml

apps/cde/base/serviceaccount.yaml

@@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: cde-vault
-  namespace: cde

apps/checklists/base/backend-deployment.yaml

@@ -17,41 +17,11 @@ spec:
       labels:
         app: checklists-backend
         service: checklists-backend
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: "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: checklists
-        vault.hashicorp.com/agent-inject-secret-checklists-db: secrets/data/postgresql/apps/checklists
-        vault.hashicorp.com/agent-inject-template-checklists-db: |-
-          {{- with secret "secrets/data/postgresql/apps/checklists" -}}
-          DATABASE_HOST=postgresql.checklists.svc.cluster.local
-          DATABASE_PORT=5432
-          DATABASE_NAME=checklists_db
-          DATABASE_USER={{ index .Data.data "username" }}
-          DATABASE_PASSWORD={{ index .Data.data "password" }}
-          {{- end -}}
-        vault.hashicorp.com/agent-inject-secret-checklists-jwt-public: secrets/data/vault/common/rsa_keys
-        vault.hashicorp.com/agent-inject-template-checklists-jwt-public: |-
-          {{- with secret "secrets/data/vault/common/rsa_keys" -}}
-          {{ index .Data.data "public_key" }}
-          {{- end -}}
     spec:
-      serviceAccountName: checklists-vault
       containers:
         - name: api
           image: cr.yandex/crp3ccidau046kdj8g9q/checklists-backend:production_68f242cd
           imagePullPolicy: IfNotPresent
-          command: ["/bin/bash", "-ec"]
-          args:
-            - |
-              set -a
-              [ -f /vault/secrets/checklists-db ] && . /vault/secrets/checklists-db
-              [ -f /vault/secrets/checklists-jwt-public ] && export JWT_AUTH_PUBLIC_KEY="$(cat /vault/secrets/checklists-jwt-public)"
-              set +a
-              exec ./entrypoint.sh
           ports:
             - name: http
               containerPort: 8000
@@ -64,17 +34,47 @@ spec:
             - name: HTTP_APP_ROOT_PATH
               value: /checklists
             - name: HTTP_APP_WORKERS
-              value: "1"
+              value: "8"
             - name: HTTP_APP_ADMIN_ENABLE
               value: "true"
             - name: JWT_AUTH_ENABLE
               value: "true"
             - name: DEBUG
               value: "false"
+            - name: DATABASE_USER
+              valueFrom:
+                secretKeyRef:
+                  key: username
+                  name: postgresql-secret
+            - name: DATABASE_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  key: password
+                  name: postgresql-secret
+            - name: DATABASE_NAME
+              valueFrom:
+                secretKeyRef:
+                  key: database
+                  name: postgresql-secret
+            - name: DATABASE_PORT
+              valueFrom:
+                secretKeyRef:
+                  key: port
+                  name: postgresql-secret
+            - name: DATABASE_HOST
+              valueFrom:
+                secretKeyRef:
+                  key: hostname
+                  name: postgresql-secret
+            - name: JWT_AUTH_PUBLIC_KEY
+              valueFrom:
+                secretKeyRef:
+                  key: public-key
+                  name: jwt-secret
 
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/checklists/base/backend-service.yaml

@@ -3,11 +3,11 @@ apiVersion: v1
 kind: Service
 metadata:
   name: rfi-backend-api-svc
-  namespace: checklists
+  namespace: rfi
 spec:
   type: ClusterIP
   selector:
-    app: checklists-backend
+    app: rfi-backend-api
   ports:
     - name: http
       port: 80

apps/checklists/base/kustomization.yaml

@@ -4,6 +4,5 @@ kind: Kustomization
 namespace: checklists
 resources:
   - namespace.yaml
-  - serviceaccount.yaml
   - backend-deployment.yaml 
   - backend-service.yaml

apps/checklists/base/serviceaccount.yaml

@@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: checklists-vault
-  namespace: checklists

apps/checklists/yc-k8s-test/postgresql.yaml

@@ -2,14 +2,14 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: postgresql
-  namespace: checklists
+  namespace:  checklists
 spec:
   interval: 5m
   timeout: 2h
   chart:
     spec:
       chart: postgresql-contour
-      version: "17.0.7"
+      version: "17.0.2"
       sourceRef:
         kind: HelmRepository
         name: yc-oci-charts
@@ -44,7 +44,7 @@ spec:
     image:
       registry: cr.yandex/crp3ccidau046kdj8g9q
       repository: contour/postgresql
-      tag: 17.0.7
+      tag: 17.0.2
       pullPolicy: Always
     metrics:
       enabled: false
@@ -61,7 +61,7 @@ spec:
           command:
             - /bin/sh
             - -c
-            - exec pg_isready -U "postgres" -d postgres -h 127.0.0.1 -p 5432
+            - exec pg_isready -U "sarex" -d postgres -h 127.0.0.1 -p 5432
         initialDelaySeconds: 30
         periodSeconds: 10
         timeoutSeconds: 5
@@ -72,7 +72,7 @@ spec:
           command:
             - /bin/sh
             - -c
-            - exec pg_isready -U "postgres" -d postgres -h 127.0.0.1 -p 5432
+            - exec pg_isready -U "sarex" -d postgres -h 127.0.0.1 -p 5432
         initialDelaySeconds: 5
         periodSeconds: 10
         timeoutSeconds: 5
@@ -83,16 +83,12 @@ spec:
           command:
             - /bin/sh
             - -c
-            - exec pg_isready -U "postgres" -d postgres -h 127.0.0.1 -p 5432
+            - exec pg_isready -U "sarex" -d postgres -h 127.0.0.1 -p 5432
         initialDelaySeconds: 30
         periodSeconds: 10
         timeoutSeconds: 5
         successThreshold: 1
         failureThreshold: 6
-      resources:
-        requests:
-          cpu: 50m
-          memory: 128Mi
       nodeSelector:
         dedicated: db
       tolerations:
@@ -102,19 +98,12 @@ spec:
           effect: NoSchedule
     contour:
       enabled: true
-      adminUser: "postgres"
+      adminUser: ""
-      sharedPreloadLibraries: "pg_stat_statements,uuid-ossp"
+      adminPasswordSecretKey: ""
-      vault:
+      sharedPreloadLibraries: "pg_stat_statements"
-        enabled: true
-        role: postgresql
-        authPath: auth/kubernetes
-        secretPath: secrets/data/postgresql/admin
-        secretKey: postgres-password
-        usersSecretPath: secrets/data/postgresql/users
       databases:
         - name: checklists_db
           user: checklists
-          passwordKey: checklists
           extensions: []
           restoreFromDump: false
       s3-proxy:

apps/comparisons/base/backend-deployment.yaml

@@ -111,7 +111,7 @@ spec:
               value: /etc/app/tasks-execution-config.json
           resources:
             requests:
-              cpu: 25m
+              cpu: 100m
               memory: 100Mi
           volumeMounts:
             - name: tasks-execution-config

apps/comparisons/base/frontend-deployment.yaml

@@ -1,57 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: frontend
-  namespace: comparisons
-  labels:
-    app: frontend
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: frontend
-  template:
-    metadata:
-      labels:
-        app: frontend
-    spec:
-      volumes:
-        - name: nginx-configmap
-          configMap:
-            name: nginx-configmap
-            items:
-              - key: nginx.conf
-                path: nginx.conf
-      containers:
-        - name: frontend
-          image: cr.yandex/crp3ccidau046kdj8g9q/comparisons-frontend:prod_6dc6e0c2
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
-          resources:
-            requests:
-              cpu: 25m
-              memory: 100Mi
-          volumeMounts:
-            - name: nginx-configmap
-              mountPath: /etc/nginx/nginx.conf
-              subPath: nginx.conf
-          livenessProbe:
-            httpGet:
-              path: /ping
-              port: 80
-            initialDelaySeconds: 10
-            periodSeconds: 10
-            failureThreshold: 10
-          readinessProbe:
-            httpGet:
-              path: /ping
-              port: 80
-            initialDelaySeconds: 10
-            periodSeconds: 10
-            failureThreshold: 20
-      imagePullSecrets:
-        - name: regcred

apps/comparisons/base/frontend-helmrelease.yaml

@@ -0,0 +1,112 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: comparisons-frontend
+  namespace: comparisons
+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:
+      frontend:
+        enabled: true
+        deployment:
+          enabled: true
+          name:
+            _default: frontend
+          replicaCount:
+            _default: 1
+          port:
+            _default: 80
+          resources:
+            requests:
+              memory:
+                _default: 100Mi
+              cpu:
+                _default: 100m
+          probes:
+            liveness:
+              enabled:
+                _default: true
+              type:
+                _default: httpGet
+              httpGet:
+                path:
+                  _default: /ping
+                port:
+                  _default: 80
+              initialDelaySeconds:
+                _default: 10
+              periodSeconds:
+                _default: 10
+              failureThreshold:
+                _default: 10
+            readiness:
+              enabled:
+                _default: true
+              type:
+                _default: httpGet
+              httpGet:
+                path:
+                  _default: /ping
+                port:
+                  _default: 80
+              initialDelaySeconds:
+                _default: 10
+              periodSeconds:
+                _default: 10
+              failureThreshold:
+                _default: 20
+          volumes:
+            _default:
+              - name: nginx-configmap
+                mountPath:
+                  _default: /etc/nginx/nginx.conf
+                subPath:
+                  _default: nginx.conf
+                configMap:
+                  name:
+                    _default: nginx-configmap
+                  items:
+                    - key: nginx.conf
+                      path:
+                        _default: nginx.conf
+        image:
+          name:
+            _default: cr.yandex/crp3ccidau046kdj8g9q/comparisons-frontend:prod_6dc6e0c2
+          pullPolicy:
+            _default: IfNotPresent
+        service:
+          enabled: true
+          name:
+            _default: frontend-service
+          type:
+            _default: ClusterIP
+          port:
+            _default: 80
+          targetPort:
+            _default: 80
+          portName:
+            _default: http
+        imagePullSecrets:
+          enabled:
+            _default: true
+          name:
+            _default: regcred

apps/comparisons/base/frontend-service.yaml

@@ -1,15 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: frontend-service
-  namespace: comparisons
-spec:
-  type: ClusterIP
-  selector:
-    app: frontend
-  ports:
-    - name: http
-      port: 80
-      targetPort: 80
-      protocol: TCP

apps/comparisons/base/kustomization.yaml

@@ -7,7 +7,6 @@ resources:
   - serviceaccount.yaml
   - backend-deployment.yaml
   - backend-service.yaml
-  - frontend-deployment.yaml
+  - frontend-helmrelease.yaml
-  - frontend-service.yaml
   - nginx-configmap.yaml
   - tasks-execution-config.yaml

apps/comparisons/yc-k8s-test/postgresql.yaml

@@ -91,8 +91,7 @@ spec:
         failureThreshold: 6
       resources:
         requests:
-          cpu: 50m
+          memory: 512Mi
-          memory: 128Mi
       nodeSelector:
         dedicated: db
       tolerations:

apps/contracts/yc-k8s-test/postgresql.yaml

@@ -58,8 +58,7 @@ spec:
         size: 20Gi
       resources:
         requests:
-          cpu: 50m
+          memory: 512Mi
-          memory: 128Mi
       customLivenessProbe:
         exec:
           command:

apps/control-interface/base/service.yaml

@@ -2,13 +2,13 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: frontend-svc
+  name: srx-admin-svc
   namespace: control-interface
 spec:
   type: ClusterIP
   selector:
     app: srx-admin
   ports:
-    - port: 80
+    - port: 8080
       targetPort: 80
       protocol: TCP

apps/cross-section/base/deployment.yaml

@@ -1,46 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: cross-section-static
-  namespace: cross-section
-  labels:
-    app: cross-section-static
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: cross-section-static
-  template:
-    metadata:
-      labels:
-        app: cross-section-static
-    spec:
-      containers:
-        - name: frontend
-          image: cr.yandex/crp3ccidau046kdj8g9q/cross-section-app:production_e09e648b
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /ping
-              port: 80
-            initialDelaySeconds: 10
-            periodSeconds: 10
-            failureThreshold: 10
-          readinessProbe:
-            httpGet:
-              path: /ping
-              port: 80
-            initialDelaySeconds: 10
-            periodSeconds: 10
-            failureThreshold: 20
-          resources:
-            requests:
-              cpu: 25m
-              memory: 100Mi
-      imagePullSecrets:
-        - name: regcred

apps/cross-section/base/frontend-helmrelease.yaml

@@ -0,0 +1,98 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cross-section-frontend
+  namespace: cross-section
+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:
+      static:
+        enabled: true
+        deployment:
+          enabled: true
+          name:
+            _default: cross-section-static
+          replicaCount:
+            _default: 2
+          port:
+            _default: 80
+          resources:
+            requests:
+              memory:
+                _default: 100Mi
+              cpu:
+                _default: 100m
+          probes:
+            liveness:
+              enabled:
+                _default: true
+              type:
+                _default: httpGet
+              httpGet:
+                path:
+                  _default: /ping
+                port:
+                  _default: 80
+              initialDelaySeconds:
+                _default: 10
+              periodSeconds:
+                _default: 10
+              failureThreshold:
+                _default: 10
+            readiness:
+              enabled:
+                _default: true
+              type:
+                _default: httpGet
+              httpGet:
+                path:
+                  _default: /ping
+                port:
+                  _default: 80
+              initialDelaySeconds:
+                _default: 10
+              periodSeconds:
+                _default: 10
+              failureThreshold:
+                _default: 20
+        image:
+          name:
+            _default: cr.yandex/crp3ccidau046kdj8g9q/cross-section-app:production_e09e648b
+          pullPolicy:
+            _default: IfNotPresent
+        service:
+          enabled: true
+          name:
+            _default: cross-section-static
+          type:
+            _default: ClusterIP
+          port:
+            _default: 80
+          targetPort:
+            _default: 80
+          portName:
+            _default: http
+        imagePullSecrets:
+          enabled:
+            _default: true
+          name:
+            _default: regcred

apps/cross-section/base/kustomization.yaml

@@ -4,5 +4,4 @@ kind: Kustomization
 namespace: cross-section
 resources:
   - namespace.yaml
-  - deployment.yaml
+  - frontend-helmrelease.yaml
-  - service.yaml

apps/cross-section/base/service.yaml

@@ -1,15 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: cross-section-static
-  namespace: cross-section
-spec:
-  type: ClusterIP
-  selector:
-    app: cross-section-static
-  ports:
-    - name: http
-      port: 80
-      targetPort: 80
-      protocol: TCP

apps/django/base/backend-deployment.yaml

@@ -50,7 +50,7 @@ spec:
           {{- with secret "secrets/data/minio/apps/django" -}}
           AWS_S3_ENDPOINT_URL=https://minio.contour.infra.sarex.tech
           S3_HOST=https://minio.contour.infra.sarex.tech
-          {{- $buckets := index .Data.data "buckets" }}
+          {{- $buckets := index .Data.data "buckets" -}}
           S3_BUCKET={{- if gt (len $buckets) 0 -}}{{ index (index $buckets 0) "name" }}{{- else -}}django{{- end -}}
           S3_LOGIN={{ index .Data.data "access_key" }}
           S3_PASSWORD={{ index .Data.data "secret_key" }}
@@ -127,11 +127,11 @@ spec:
             - name: DJANGO_SETTINGS_MODULE
               value: config.settings.production
             - name: CELERY_REDIS_HOST
-              value: redis
+              value: redis-service
             - name: CELERY_REDIS_PORT
               value: "6379"
             - name: DJANGO_REDIS_HOST
-              value: redis
+              value: redis-service
             - name: DJANGO_REDIS_PORT
               value: "6379"
             - name: BIMV2_INTERNAL_HOST
@@ -149,13 +149,13 @@ spec:
             - name: MEASUREMENTS_USE_MEASUREMENTS
               value: "1"
             - name: SERVER_API_HOST
-              value: https://sarex.contour.infra.sarex.tech
+              value: https://wb.sarex.io
             - name: SERVER_HOST
-              value: https://sarex.contour.infra.sarex.tech
+              value: https://wb.sarex.io
             - name: WORKFLOWS_HOST
-              value: https://sarex.contour.infra.sarex.tech
+              value: https://wb.sarex.io
             - name: WORKFLOWS_BASE_HOST
-              value: https://sarex.contour.infra.sarex.tech
+              value: https://wb.sarex.io
             - name: WORKFLOWS_USE
               value: "1"
             - name: SERVER_S3_STREAM_IMPORT
@@ -203,8 +203,8 @@ spec:
 
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
           volumeMounts:
             - name: django-configmap
               mountPath: /opt/sarex/config/settings/production.py

apps/django/base/celery-deployment.yaml

@@ -50,7 +50,7 @@ spec:
           {{- with secret "secrets/data/minio/apps/django" -}}
           AWS_S3_ENDPOINT_URL=https://minio.contour.infra.sarex.tech
           S3_HOST=https://minio.contour.infra.sarex.tech
-          {{- $buckets := index .Data.data "buckets" }}
+          {{- $buckets := index .Data.data "buckets" -}}
           S3_BUCKET={{- if gt (len $buckets) 0 -}}{{ index (index $buckets 0) "name" }}{{- else -}}django{{- end -}}
           S3_LOGIN={{ index .Data.data "access_key" }}
           S3_PASSWORD={{ index .Data.data "secret_key" }}
@@ -121,11 +121,11 @@ spec:
             - name: DJANGO_SETTINGS_MODULE
               value: config.settings.production
             - name: CELERY_REDIS_HOST
-              value: redis
+              value: redis-service
             - name: CELERY_REDIS_PORT
               value: "6379"
             - name: DJANGO_REDIS_HOST
-              value: redis
+              value: redis-service
             - name: DJANGO_REDIS_PORT
               value: "6379"
             - name: BIMV2_INTERNAL_HOST
@@ -194,8 +194,8 @@ spec:
               value: "False"
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
           volumeMounts:
             - name: django-configmap
               mountPath: /opt/sarex/config/settings/production.py

apps/django/base/django-configmap.yaml

@@ -5,57 +5,16 @@ metadata:
   namespace: django
 data:
   production.py: |
-    import ast
     import os
     from .base import *
     from logging.handlers import SysLogHandler
     from datetime import timedelta
 
-    def _load_env_file(path):
-        try:
-            with open(path, "r", encoding="utf-8") as f:
-                for raw_line in f:
-                    line = raw_line.strip()
-                    if not line or line.startswith("#") or "=" not in line:
-                        continue
-                    key, value = line.split("=", 1)
-                    key = key.strip()
-                    value = value.strip()
-                    if len(value) >= 2 and value[0] == value[-1] and value[0] in ("'", '"'):
-                        try:
-                            value = ast.literal_eval(value)
-                        except (ValueError, SyntaxError):
-                            value = value[1:-1]
-                    if key and key not in os.environ:
-                        os.environ[key] = value
-        except FileNotFoundError:
-            pass
-
-    def _read_secret_file(path, default=""):
-        try:
-            with open(path, "r", encoding="utf-8") as f:
-                return f.read().strip()
-        except FileNotFoundError:
-            return default
-
-    # Fallback for manage.py launched via `kubectl exec` (outside entrypoint),
-    # so Django can still read DB/JWT values from Vault-injected files.
-    _load_env_file("/vault/secrets/django-postgresql")
-    _load_env_file("/vault/secrets/django-rabbitmq")
-    _load_env_file("/vault/secrets/django-s3")
-    _load_env_file("/vault/secrets/django-kafka")
-    _load_env_file("/vault/secrets/django-common")
-
-    if not os.environ.get("JWT_PRIVATE_KEY"):
-        os.environ["JWT_PRIVATE_KEY"] = _read_secret_file("/vault/secrets/django-jwt-private")
-    if not os.environ.get("JWT_PUBLIC_KEY"):
-        os.environ["JWT_PUBLIC_KEY"] = _read_secret_file("/vault/secrets/django-jwt-public")
-
     ALLOWED_HOSTS = ["*"]
     FILE_UPLOAD_PERMISSIONS = 0o644
     DEBUG = False
     CSRF_COOKIE_SECURE = True
-    CSRF_TRUSTED_ORIGINS = ["https://sarex.contour.infra.sarex.tech", "http://sarex.contour.infra.sarex.tech"]
+    CSRF_TRUSTED_ORIGINS = ["https://lk.srx.wb.ru:30443", "https://lk.srx.wb.ru"]
     SESSION_COOKIE_SECURE = True
     SECURE_SSL_REDIRECT = False
 
@@ -87,7 +46,7 @@ data:
         'Bearer',
     )
 
-    HOST = "https://sarex.contour.infra.sarex.tech"
+    HOST = "https://wb.sarex.io"
 
     POSTGRES_DATABASE = os.environ.get('DJANGO_POSTGRES_DATABASE')
     POSTGRES_USER = os.environ.get('DJANGO_POSTGRES_USER')
@@ -150,8 +109,8 @@ data:
         'BLACKLIST_AFTER_ROTATION': True,
         'UPDATE_LAST_LOGIN': False,
         'ALGORITHM': 'RS512',
-        'SIGNING_KEY': os.environ.get("JWT_PRIVATE_KEY", "").replace("\\n", "\n"),
+        'SIGNING_KEY': os.environ.get("JWT_PRIVATE_KEY").replace("\\n", "\n"),
-        'VERIFYING_KEY': os.environ.get("JWT_PUBLIC_KEY", "").replace("\\n", "\n"),
+        'VERIFYING_KEY': os.environ.get("JWT_PUBLIC_KEY").replace("\\n", "\n"),
         'AUDIENCE': None,
         'ISSUER': os.environ.get('SIMPLE_JWT_ISSUER', 'default_issuer'),
         'AUTH_HEADER_TYPES': ('Bearer',),
@@ -310,7 +269,7 @@ data:
 
 
     DEBUG=True
-    WEB_APP_AUTH_MODE='jwt-session-based'
+    #WEB_APP_AUTH_MODE='jwt-session-based'
 
 
     SAREX_MODULES_SETTINGS = {
@@ -319,3 +278,4 @@ data:
         },
         "sso_logout_redirect": True
     }
+

apps/django/base/frontend-deployment.yaml

@@ -1,44 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: frontend
-  namespace: django
-  labels:
-    app: frontend
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: frontend
-  template:
-    metadata:
-      labels:
-        app: frontend
-    spec:
-      volumes:
-        - name: nginx-configmap
-          configMap:
-            name: nginx-configmap
-            items:
-              - key: nginx.conf
-                path: nginx.conf
-          defaultMode: 420
-      containers:
-        - name: frontend
-          image: cr.yandex/crp3ccidau046kdj8g9q/sarex-frontend-dev:contour_0b579274
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
-          resources:
-            requests:
-              cpu: 25m
-              memory: 100Mi
-          volumeMounts:
-            - name: nginx-configmap
-              mountPath: /etc/nginx/nginx.conf
-              subPath: nginx.conf
-      imagePullSecrets:
-        - name: regcred

apps/django/base/frontend-helmrelease.yaml

@@ -0,0 +1,81 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: django-frontend
+  namespace: django
+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:
+      frontend:
+        enabled: true
+        deployment:
+          enabled: true
+          name:
+            _default: frontend
+          replicaCount:
+            _default: 1
+          port:
+            _default: 80
+          resources:
+            requests:
+              memory:
+                _default: 100Mi
+              cpu:
+                _default: 100m
+          volumes:
+            _default:
+              - name: nginx-configmap
+                mountPath:
+                  _default: /etc/nginx/nginx.conf
+                subPath:
+                  _default: nginx.conf
+                configMap:
+                  name:
+                    _default: nginx-configmap
+                  items:
+                    - key: nginx.conf
+                      path:
+                        _default: nginx.conf
+                  defaultMode:
+                    _default: 420
+        image:
+          name:
+            _default: cr.yandex/crp3ccidau046kdj8g9q/sarex-frontend-dev:contour_0b579274
+          pullPolicy:
+            _default: IfNotPresent
+        service:
+          enabled: true
+          name:
+            _default: frontend-svc
+          type:
+            _default: ClusterIP
+          port:
+            _default: 80
+          targetPort:
+            _default: 80
+          portName:
+            _default: http
+        imagePullSecrets:
+          enabled:
+            _default: true
+          name:
+            _default: regcred

apps/django/base/frontend-service.yaml

@@ -1,15 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: frontend-svc
-  namespace: django
-spec:
-  type: ClusterIP
-  selector:
-    app: frontend
-  ports:
-    - name: http
-      port: 80
-      targetPort: 80
-      protocol: TCP

apps/django/base/kustomization.yaml

@@ -7,9 +7,8 @@ resources:
   - serviceaccount.yaml
   - backend-deployment.yaml
   - celery-deployment.yaml
-  - frontend-deployment.yaml
   - backend-service.yaml
-  - frontend-service.yaml
+  - frontend-helmrelease.yaml
   - django-configmap.yaml
   - srx-admin-deployment.yaml
   - srx-admin-service.yaml

apps/django/base/nginx-configmap.yaml

@@ -80,19 +80,10 @@ data:
             # }
             
             location ~^/workspaces-v2/(.+).js {
-                proxy_http_version 1.1;
-                proxy_set_header Connection "";
                 rewrite /workspaces-v2/(.+) /$1 break;
                 proxy_pass http://frontend-svc.workspaces.svc.cluster.local:80;
             }
 
-            location ~^/workspaces-v2/(.+)\.wasm$ {
-                proxy_http_version 1.1;
-                proxy_set_header Connection "";
-                rewrite ^/workspaces-v2/(.+) /$1 break;
-                proxy_pass http://frontend-svc.workspaces.svc.cluster.local:80;
-            }
-
             location @index {
                 add_header Cache-Control 'no-cache, must-revalidate, proxy-revalidate, max-age=0';
                 if_modified_since off;
@@ -100,10 +91,10 @@ data:
                 try_files /static/index.html =404;
             }
             
-            # location ~^/workflows/(.+).js {
+            location ~^/workflows/(.+).js {
-            #     rewrite /workflows/(.+) /$1 break;
+                rewrite /workflows/(.+) /$1 break;
-            #     proxy_pass http://frontend-svc.processing.svc.cluster.local:80;
+                proxy_pass http://frontend-svc.processing.svc.cluster.local:80;
-            # }
+            }
             location /service-worker.js {
                 try_files /static/$uri @index;
             }

apps/django/base/srx-admin-deployment.yaml

@@ -26,7 +26,7 @@ spec:
               protocol: TCP
           resources:
             requests:
-              cpu: 25m
+              cpu: 100m
               memory: 100Mi
       imagePullSecrets:
         - name: regcred

apps/django/yc-k8s-test/kustomization.yaml

@@ -4,6 +4,4 @@ kind: Kustomization
 resources:
   - ../base
   - postgresql.yaml
-  - redis-deployment.yaml
-  - redis-service.yaml
 patches: []

apps/django/yc-k8s-test/postgresql.yaml

@@ -91,8 +91,7 @@ spec:
         failureThreshold: 6
       resources:
         requests:
-          cpu: 50m
+          memory: 512Mi
-          memory: 128Mi
       nodeSelector:
         dedicated: db
       tolerations:

apps/django/yc-k8s-test/redis-deployment.yaml

@@ -1,27 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: redis
-  namespace: django
-  labels:
-    app: redis
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: redis
-  template:
-    metadata:
-      labels:
-        app: redis
-    spec:
-      containers:
-        - name: redis
-          image: cr.yandex/crp3ccidau046kdj8g9q/redis:latest
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 6379
-              protocol: TCP
-      imagePullSecrets:
-        - name: regcred

apps/django/yc-k8s-test/redis-service.yaml

@@ -1,13 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis
-  namespace: django
-spec:
-  selector:
-    app: redis
-  ports:
-    - port: 6379
-      targetPort: 6379
-      protocol: TCP

apps/document-link/base/deployment.yaml

@@ -1,33 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: frontend
-  namespace: document-link
-  labels:
-    app: frontend
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: frontend
-  template:
-    metadata:
-      labels:
-        app: frontend
-        version: stable
-    spec:
-      containers:
-        - name: frontend
-          image: cr.yandex/crp3ccidau046kdj8g9q/document-link-frontend:wb_cb2027ce
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
-          resources:
-            requests:
-              cpu: 25m
-              memory: 100Mi
-      imagePullSecrets:
-        - name: regcred

apps/document-link/base/frontend-helmrelease.yaml

@@ -0,0 +1,65 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: document-link-frontend
+  namespace: document-link
+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:
+      frontend:
+        enabled: true
+        deployment:
+          enabled: true
+          name:
+            _default: frontend
+          replicaCount:
+            _default: 1
+          port:
+            _default: 80
+          resources:
+            requests:
+              memory:
+                _default: 100Mi
+              cpu:
+                _default: 100m
+        image:
+          name:
+            _default: cr.yandex/crp3ccidau046kdj8g9q/document-link-frontend:wb_cb2027ce
+          pullPolicy:
+            _default: IfNotPresent
+        service:
+          enabled: true
+          name:
+            _default: frontend-service
+          type:
+            _default: ClusterIP
+          port:
+            _default: 80
+          targetPort:
+            _default: 80
+          portName:
+            _default: http
+        imagePullSecrets:
+          enabled:
+            _default: true
+          name:
+            _default: regcred

apps/document-link/base/kustomization.yaml

@@ -4,5 +4,4 @@ kind: Kustomization
 namespace: document-link
 resources:
   - namespace.yaml
-  - deployment.yaml
+  - frontend-helmrelease.yaml
-  - service.yaml

apps/document-link/base/service.yaml

@@ -1,15 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: frontend-service
-  namespace: document-link
-spec:
-  type: ClusterIP
-  selector:
-    app: frontend
-  ports:
-    - name: http
-      port: 80
-      targetPort: 80
-      protocol: TCP

apps/documentations/base/api-deployment.yaml

@@ -72,7 +72,7 @@ spec:
               exec /app/entrypoint.sh
           ports:
             - name: http
-              containerPort: 8080
+              containerPort: 8000
               protocol: TCP
           env:
             - name: POSTGRES_POOL_SIZE
@@ -82,9 +82,9 @@ spec:
             - name: ZITADEL_DOMAIN
               value: zitadel-srx.wb.ru
             - name: USE_ZITADEL
-              value: "0"
+              value: "1"
             - name: FLOWS_URL
-              value: http://backend-svc.flows.svc.cluster.local:80
+              value: http://backend-service.flows.svc.cluster.local:8000
             - name: LAST_MASTER_BIM
               value: "36311"
             - name: API_ADDRESS
@@ -98,7 +98,7 @@ spec:
             - name: ENABLE_SSL
               value: "0"
             - name: WORKSPACE_V2_EXTERNAL_URL
-              value: https://sarex.contour.infra.sarex.tech/workspaces-v2/
+              value: https://srx.wb.ru/workspaces-v2/
             - name: ENABLE_S3
               value: "1"
             - name: CONTAINER_REGISTRY
@@ -108,15 +108,15 @@ spec:
             - name: LAST_SLAVE_1_BIM
               value: "1000000"
             - name: HOST
-              value: http://backend-api-svc.documentations.svc.cluster.local:80
+              value: http://documentations-api.documentations.svc.cluster.local:8080
             - name: FILE_STREAM_HOST
-              value: sarex.contour.infra.sarex.tech
+              value: srx.wb.ru
             - name: DOCUMENTATION_URL
-              value: http://documentations-api.documentations.svc.cluster.local:80/
+              value: http://documentations-api.documentations.svc.cluster.local:8080/
             - name: WORKFLOW_URL
-              value: http://backend-svc.processing.svc.cluster.local:80/
+              value: http://workflows-api-service.workflow.svc.cluster.local:8000/
             - name: WORKSPACE_URL
-              value: http://backend-svc.workspaces.svc.cluster.local:80/
+              value: http://workspaces-service.workspaces.svc.cluster.local:8000/
             - name: BIM_API_URL
               value: http://bim-api-service.bim.svc.cluster.local:8080/
             - name: BIM_API_V2_URL
@@ -124,9 +124,9 @@ spec:
             - name: WORKSPACE_BUNDLE_VERSION
               value: v1
             - name: SYSTEM_LOG_URL
-              value: http://backend-svc.system-log.svc.cluster.local:80
+              value: http://api-service.system-log.svc.cluster.local:8000
             - name: DJANGO_HOST
-              value: http://backend-svc.django.svc.cluster.local:80
+              value: http://backend.django.svc.cluster.local:8000
             - name: MARKS_PROCESSING_URL
               value: http://marks-service:8000
             - name: PUBLIC_LINK_HOST
@@ -152,9 +152,9 @@ spec:
             - name: CACHE_CLEANUP_INTERVAL
               value: 60s
             - name: ENABLE_AUTH_JWT_IN_URL
-              value: "true"
-            - name: ENABLE_SIGNATURE_IN_URL
               value: "false"
+            - name: ENABLE_SIGNATURE_IN_URL
+              value: "true"
             - name: USE_CACHE_IN_FILE_STREAMER
               value: "0"
             - name: VALKEY_ADDR
@@ -166,8 +166,8 @@ spec:
       
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
 
       imagePullSecrets:
         - name: regcred

apps/documentations/base/api-service.yaml

@@ -11,5 +11,5 @@ spec:
   ports:
     - name: http
       port: 80
-      targetPort: 8080
+      targetPort: 8000
       protocol: TCP

apps/documentations/base/filestream-deployment.yaml

@@ -72,7 +72,7 @@ spec:
               exec /app/file_entrypoint.sh
           ports:
             - name: http
-              containerPort: 8080
+              containerPort: 8000
               protocol: TCP
           env:
             - name: POSTGRES_POOL_SIZE
@@ -82,9 +82,9 @@ spec:
             - name: ZITADEL_DOMAIN
               value: zitadel-srx.wb.ru
             - name: USE_ZITADEL
-              value: "0"
+              value: "1"
             - name: FLOWS_URL
-              value: http://backend-svc.flows.svc.cluster.local:80
+              value: http://backend-service.flows.svc.cluster.local:8000
             - name: LAST_MASTER_BIM
               value: "36311"
             - name: API_ADDRESS
@@ -108,15 +108,15 @@ spec:
             - name: LAST_SLAVE_1_BIM
               value: "1000000"
             - name: HOST
-              value: http://backend-api-svc.documentations.svc.cluster.local:80
+              value: http://documentations-api.documentations.svc.cluster.local:8080
             - name: FILE_STREAM_HOST
               value: srx.wb.ru
             - name: DOCUMENTATION_URL
-              value: http://backend-api-svc.documentations.svc.cluster.local:80/
+              value: http://documentations-api.documentations.svc.cluster.local:8080/
             - name: WORKFLOW_URL
               value: http://workflows-api-service.workflow.svc.cluster.local:8000/
             - name: WORKSPACE_URL
-              value: http://backend-svc.workspaces.svc.cluster.local:80/
+              value: http://workspaces-service.workspaces.svc.cluster.local:8000/
             - name: BIM_API_URL
               value: http://bim-api-service.bim.svc.cluster.local:8080/
             - name: BIM_API_V2_URL
@@ -126,7 +126,7 @@ spec:
             - name: SYSTEM_LOG_URL
               value: http://api-service.system-log.svc.cluster.local:8000
             - name: DJANGO_HOST
-              value: http://backend-svc.django.svc.cluster.local:80
+              value: http://backend.django.svc.cluster.local:8000
             - name: MARKS_PROCESSING_URL
               value: http://marks-service:8000
             - name: PUBLIC_LINK_HOST
@@ -166,8 +166,8 @@ spec:
       
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
 
       imagePullSecrets:
         - name: regcred

apps/documentations/base/filestream-service.yaml

@@ -11,5 +11,5 @@ spec:
   ports:
     - name: http
       port: 80
-      targetPort: 8080
+      targetPort: 8000
       protocol: TCP

apps/documentations/base/frontend-deployment.yaml

@@ -1,32 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: frontend
-  namespace: documentations
-  labels:
-    app: frontend
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: frontend
-  template:
-    metadata:
-      labels:
-        app: frontend
-    spec:
-      containers:
-        - name: frontend
-          image: cr.yandex/crp3ccidau046kdj8g9q/documentation-frontend-app:brusnika_ae1bb076
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
-          resources:
-            requests:
-              cpu: 25m
-              memory: 100Mi
-      imagePullSecrets:
-        - name: regcred

apps/documentations/base/frontend-helmrelease.yaml

@@ -0,0 +1,65 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: documentations-frontend
+  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:
+      frontend:
+        enabled: true
+        deployment:
+          enabled: true
+          name:
+            _default: frontend
+          replicaCount:
+            _default: 1
+          port:
+            _default: 80
+          resources:
+            requests:
+              memory:
+                _default: 100Mi
+              cpu:
+                _default: 100m
+        image:
+          name:
+            _default: cr.yandex/crp3ccidau046kdj8g9q/documentation-frontend-app:brusnika_ce5555d3
+          pullPolicy:
+            _default: IfNotPresent
+        service:
+          enabled: true
+          name:
+            _default: frontend-service
+          type:
+            _default: ClusterIP
+          port:
+            _default: 80
+          targetPort:
+            _default: 80
+          portName:
+            _default: http
+        imagePullSecrets:
+          enabled:
+            _default: true
+          name:
+            _default: regcred

apps/documentations/base/frontend-service.yaml

@@ -1,15 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: frontend-svc
-  namespace: documentations
-spec:
-  type: ClusterIP
-  selector:
-    app: frontend
-  ports:
-    - name: http
-      port: 80
-      targetPort: 80
-      protocol: TCP

apps/documentations/base/kustomization.yaml

@@ -8,8 +8,7 @@ resources:
   - api-deployment.yaml
   - pdm-deployment.yaml
   - filestream-deployment.yaml
-  - frontend-deployment.yaml
   - api-service.yaml
   - pdm-service.yaml
   - filestream-service.yaml
-  - frontend-service.yaml
+  - frontend-helmrelease.yaml

apps/documentations/base/pdm-deployment.yaml

@@ -106,13 +106,13 @@ spec:
             - name: CACHE_DEFAULT_EXPIRATION
               value: 60s
             - name: DJANGO_HOST
-              value: http://backend-svc.django.svc.cluster.local:80
+              value: http://backend.django.svc.cluster.local:8000
             - name: DJANGO_ORIGINATOR
               value: docs_prod
             - name: DOCUMENTATION_URL
-              value: http://backend-api-svc.documentations.svc.cluster.local:80/
+              value: http://documentations-api.documentations.svc.cluster.local:8080/
             - name: EAV_URL
-              value: http://backend-svc.eav.svc.cluster.local:80
+              value: http://eav-service.eav.svc.cluster.local:8000
             - name: ENABLE_OBSERVABILITY
               value: "false"
             - name: ENABLE_S3
@@ -122,7 +122,7 @@ spec:
             - name: ENVIRONMENT
               value: prod
             - name: FLOWS_URL
-              value: http://backend-svc.flows.svc.cluster.local:80
+              value: http://backend-service.flows.svc.cluster.local:8000
             - name: HEIGHT_THUMB_ATTACHMENTS
               value: "300"
             - name: HEIGHT_THUMB_STATES
@@ -147,13 +147,13 @@ spec:
             - name: S3_SERVICE_ACCOUNT
               value: /vault/secrets/documentations-s3-account-json
             - name: STATES_URL
-              value: http://backend-svc.workspaces.svc.cluster.local:80/
+              value: http://workspaces-service.workspaces.svc.cluster.local:8000/
             - name: SUBSCRIPTIONS_URL
-              value: http://backend-svc.subscriptions.svc.cluster.local:80
+              value: http://sarex-subscriptions-service.subscriptions.svc.cluster.local:80
             - name: SYSTEM_LOG_URL
               value: http://api-service.system-log.svc.cluster.local:8000
             - name: TARGET_URL
-              value: http://backend-svc.django.svc.cluster.local:80
+              value: http://backend.django.svc.cluster.local:8000
             - name: USE_CACHE_IN_FILE_STREAMER
               value: "1"
             - name: USE_SUBSCRIPTIONS
@@ -167,15 +167,15 @@ spec:
             - name: WORKFLOW_IMAGES_VERSION
               value: master
             - name: WORKFLOW_URL
-              value: http://backend-svc.processing.svc.cluster.local:80/
+              value: http://workflows-api-service.workflow.svc.cluster.local:8000/
             - name: WORKSPACE_BUNDLE_VERSION
               value: v1
             - name: WORKSPACE_URL
-              value: http://backend-svc.workspaces.svc.cluster.local:80/
+              value: http://workspaces-service.workspaces.svc.cluster.local:8000/
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
 
       imagePullSecrets:
         - name: regcred

apps/documentations/yc-k8s-test/kustomization.yaml

@@ -4,6 +4,4 @@ kind: Kustomization
 resources:
   - ../base
   - postgresql.yaml
-  - redis-deployment.yaml
-  - redis-service.yaml
 patches: []

apps/documentations/yc-k8s-test/postgresql.yaml

@@ -91,8 +91,7 @@ spec:
         failureThreshold: 6
       resources:
         requests:
-          cpu: 50m
+          memory: 512Mi
-          memory: 128Mi
       nodeSelector:
         dedicated: db
       tolerations:

apps/documentations/yc-k8s-test/redis-deployment.yaml

@@ -1,27 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: redis
-  namespace: documentations
-  labels:
-    app: redis
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: redis
-  template:
-    metadata:
-      labels:
-        app: redis
-    spec:
-      containers:
-        - name: redis
-          image: cr.yandex/crp3ccidau046kdj8g9q/redis:latest
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 6379
-              protocol: TCP
-      imagePullSecrets:
-        - name: regcred

apps/documentations/yc-k8s-test/redis-service.yaml

@@ -1,13 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis
-  namespace: documentations
-spec:
-  selector:
-    app: redis
-  ports:
-    - port: 6379
-      targetPort: 6379
-      protocol: TCP

apps/drawings/yc-k8s-test/postgresql.yaml

@@ -91,8 +91,7 @@ spec:
         failureThreshold: 6
       resources:
         requests:
-          cpu: 50m
+          memory: 512Mi
-          memory: 128Mi
       nodeSelector:
         dedicated: db
       tolerations:

apps/eav/base/backend-deployment.yaml

@@ -89,7 +89,7 @@ spec:
 
           resources:
             requests:
-              cpu: 25m
+              cpu: 100m
               memory: 100Mi
 
           volumeMounts:

apps/eav/base/backend-service.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: backend-svc
+  name: backend-service
   namespace: eav
 spec:
   type: ClusterIP
@@ -10,6 +10,6 @@ spec:
     app: backend
   ports:
     - name: http
-      port: 80
+      port: 8000
       targetPort: 8000
       protocol: TCP

apps/eav/yc-k8s-test/postgresql.yaml

@@ -91,8 +91,7 @@ spec:
         failureThreshold: 6
       resources:
         requests:
-          cpu: 50m
+          memory: 512Mi
-          memory: 128Mi
       nodeSelector:
         dedicated: db
       tolerations:

apps/faas/base/export-reviews.yaml

@@ -38,7 +38,7 @@ spec:
             - name: DOCUMENTATIONS_HOST
               value: https://sarex.contour.infra.sarex.tech/documentations
             - name: EAV_HOST
-              value: http://backend-svc.eav.svc.cluster.local:80
+              value: http://eav-service.eav.svc.cluster.local:8000
             - name: TRANSMITTALS_INTERNAL_HOST
               value: http://transmittal-service.transmittal.svc.cluster.local:80/internal/v1
             - name: DJANGO_TIMEOUT
@@ -58,7 +58,7 @@ spec:
 
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/flows/base/backend-deployment.yaml

@@ -86,17 +86,17 @@ spec:
             - name: CELERY_QUEUE
               value: flow
             - name: EAV_HOST
-              value: http://backend-svc.eav.svc.cluster.local:80
+              value: http://eav-service.eav.svc.cluster.local:8000
             - name: DJANGO_HOST
-              value: http://backend-svc.django.svc.cluster.local:80/api
+              value: http://backend-svc.django.svc.cluster.local:8000/api
             - name: PLANNING_HOST
-              value: http://backend-svc.pm.svc.cluster.local:80/api/pm/msp
+              value: http://backend-service.pm.svc.cluster.local:8000/api/pm/msp
             - name: PLANNING_USE
               value: "True"
             - name: DOCUMENTATION_HOST
-              value: http://backend-api-svc.documentations.svc.cluster.local:80/internal/v1
+              value: http://documentations-api.documentations.svc.cluster.local:8080/internal/v1
             - name: DOCUMENTATION_EXTERNAL_HOST
-              value: http://backend-api-svc.documentations.svc.cluster.local:80/api/v1
+              value: http://documentations-api.documentations.svc.cluster.local:8080/api/v1
             - name: ENABLE_ANALYTICS
               value: "1"
             - name: ENABLE_CELERY
@@ -131,7 +131,7 @@ spec:
               value: "60"
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/flows/base/celery-deployment.yaml

@@ -86,17 +86,17 @@ spec:
             - name: CELERY_QUEUE
               value: flow
             - name: EAV_HOST
-              value: http://backend-svc.eav.svc.cluster.local:80
+              value: http://eav-service.eav.svc.cluster.local:8000
             - name: DJANGO_HOST
-              value: http://backend-svc.django.svc.cluster.local:80/api
+              value: http://backend-svc.django.svc.cluster.local:8000/api
             - name: PLANNING_HOST
-              value: http://backend-service.pm.svc.cluster.local:80/api/pm/msp
+              value: http://backend-service.pm.svc.cluster.local:8000/api/pm/msp
             - name: PLANNING_USE
               value: "True"
             - name: DOCUMENTATION_HOST
-              value: http://backend-api-svc.documentations.svc.cluster.local:80/internal/v1
+              value: http://documentations-api.documentations.svc.cluster.local:8080/internal/v1
             - name: DOCUMENTATION_EXTERNAL_HOST
-              value: http://backend-api-svc.documentations.svc.cluster.local:80/api/v1
+              value: http://documentations-api.documentations.svc.cluster.local:8080/api/v1
             - name: ENABLE_ANALYTICS
               value: "1"
             - name: ENABLE_CELERY
@@ -131,7 +131,7 @@ spec:
               value: "60"
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/flows/base/frontend-deployment.yaml

@@ -1,32 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: frontend
-  namespace: flows
-  labels:
-    app: frontend
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: frontend
-  template:
-    metadata:
-      labels:
-        app: frontend
-    spec:
-      containers:
-        - name: frontend
-          image: cr.yandex/crp3ccidau046kdj8g9q/flows-frontend:contour_5b2bd144
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
-          resources:
-            requests:
-              cpu: 25m
-              memory: 100Mi
-      imagePullSecrets:
-        - name: regcred

apps/flows/base/frontend-helmrelease.yaml

@@ -0,0 +1,65 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: flows-frontend
+  namespace: flows
+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:
+      frontend:
+        enabled: true
+        deployment:
+          enabled: true
+          name:
+            _default: frontend
+          replicaCount:
+            _default: 1
+          port:
+            _default: 80
+          resources:
+            requests:
+              memory:
+                _default: 100Mi
+              cpu:
+                _default: 100m
+        image:
+          name:
+            _default: cr.yandex/crp3ccidau046kdj8g9q/flows-frontend:contour_5b2bd144
+          pullPolicy:
+            _default: IfNotPresent
+        service:
+          enabled: true
+          name:
+            _default: frontend-service
+          type:
+            _default: ClusterIP
+          port:
+            _default: 80
+          targetPort:
+            _default: 80
+          portName:
+            _default: http
+        imagePullSecrets:
+          enabled:
+            _default: true
+          name:
+            _default: regcred

apps/flows/base/frontend-service.yaml

@@ -1,15 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: frontend-svc
-  namespace: flows
-spec:
-  type: ClusterIP
-  selector:
-    app: frontend
-  ports:
-    - name: http
-      port: 80
-      targetPort: 80
-      protocol: TCP

apps/flows/base/kustomization.yaml

@@ -7,6 +7,5 @@ resources:
   - serviceaccount.yaml
   - backend-deployment.yaml
   - celery-deployment.yaml
-  - frontend-deployment.yaml
   - backend-service.yaml
-  - frontend-service.yaml
+  - frontend-helmrelease.yaml

apps/flows/yc-k8s-test/postgresql.yaml

@@ -91,8 +91,7 @@ spec:
         failureThreshold: 6
       resources:
         requests:
-          cpu: 50m
+          memory: 512Mi
-          memory: 128Mi
       nodeSelector:
         dedicated: db
       tolerations:

apps/inspections/base/backend-deployment.yaml

@@ -114,7 +114,7 @@ spec:
 
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/inspections/yc-k8s-test/postgresql.yaml

@@ -89,10 +89,6 @@ spec:
         timeoutSeconds: 5
         successThreshold: 1
         failureThreshold: 6
-      resources:
-        requests:
-          cpu: 50m
-          memory: 128Mi
       nodeSelector:
         dedicated: db
       tolerations:

apps/issues/base/backend-deployment.yaml

@@ -100,33 +100,33 @@ spec:
             - name: ENVIRONMENT
               value: production
             - name: AERO_PUBLIC_HOST
-              value: https://sarex.contour.infra.sarex.tech
+              value: https://srx.wb.ru
             - name: AERO_HOST
-              value: https://sarex.contour.infra.sarex.tech
+              value: https://srx.wb.ru
             - name: BASE_AERO_URL
-              value: https://sarex.contour.infra.sarex.tech
+              value: https://srx.wb.ru
             - name: BASE_AUTH_URL
-              value: http://backend-svc.django.svc.cluster.local:80
+              value: http://backend-svc.django.svc.cluster.local:8000
             - name: WORKFLOWS_HOST
-              value: http://backend-svc.workflow.svc.cluster.local:80
+              value: http://workflows-api-service.workflow.svc.cluster.local:8000
             - name: WORKFLOWS_URL
-              value: http://backend-svc.workflow.svc.cluster.local:80
+              value: http://workflows-api-service.workflow.svc.cluster.local:8000
             - name: RESOURCES_API_HOST
-              value: http://backend-svc.resources.svc.cluster.local:80
+              value: http://resources-service.resources.svc.cluster.local:8000
             - name: EAV_HOST
-              value: http://backend-svc.eav.svc.cluster.local:80
+              value: http://eav-service.eav.svc.cluster.local:8000
             - name: SAREX_API
-              value: https://sarex.contour.infra.sarex.tech
+              value: https://srx.wb.ru
             - name: DOCUMENTATIONS_URL
-              value: http://documentations-api-svc.documentations.svc.cluster.local:80
+              value: http://documentations-api.documentations.svc.cluster.local:8080
             - name: DJANGO_SETTINGS_MODULE
               value: config.settings.production
             - name: API_ADDRESS
               value: "8000"
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
           volumeMounts:
             - name: production-configmap
               mountPath: /src/config/settings/production.py

apps/issues/base/celery-deployment.yaml

@@ -106,27 +106,27 @@ spec:
             - name: BASE_AERO_URL
               value: https://srx.wb.ru
             - name: BASE_AUTH_URL
-              value: http://backend-svc.django.svc.cluster.local:80
+              value: http://backend-svc.django.svc.cluster.local:8000
             - name: WORKFLOWS_HOST
               value: http://workflows-api-service.workflow.svc.cluster.local:8000
             - name: WORKFLOWS_URL
               value: http://workflows-api-service.workflow.svc.cluster.local:8000
             - name: RESOURCES_API_HOST
-              value: http://backend-svc.resources.svc.cluster.local:80
+              value: http://resources-service.resources.svc.cluster.local:8000
             - name: EAV_HOST
-              value: http://backend-svc.eav.svc.cluster.local:80
+              value: http://eav-service.eav.svc.cluster.local:8000
             - name: SAREX_API
               value: https://srx.wb.ru
             - name: DOCUMENTATIONS_URL
-              value: http://backend-api-svc.documentations.svc.cluster.local:80
+              value: http://documentations-api.documentations.svc.cluster.local:8080
             - name: DJANGO_SETTINGS_MODULE
               value: config.settings.production
             - name: API_ADDRESS
               value: "8000"
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
           volumeMounts:
             - name: production-configmap
               mountPath: /src/config/settings/production.py

apps/issues/base/frontend-deployment.yaml

@@ -1,32 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: frontend
-  namespace: issues
-  labels:
-    app: frontend
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: frontend
-  template:
-    metadata:
-      labels:
-        app: frontend
-    spec:
-      containers:
-        - name: frontend
-          image: cr.yandex/crp3ccidau046kdj8g9q/contour_issues-frontend:716a2b73
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
-          resources:
-            requests:
-              cpu: 25m
-              memory: 100Mi
-      imagePullSecrets:
-        - name: regcred

apps/issues/base/frontend-helmrelease.yaml

@@ -0,0 +1,65 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: issues-frontend
+  namespace: issues
+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:
+      frontend:
+        enabled: true
+        deployment:
+          enabled: true
+          name:
+            _default: frontend
+          replicaCount:
+            _default: 1
+          port:
+            _default: 80
+          resources:
+            requests:
+              memory:
+                _default: 100Mi
+              cpu:
+                _default: 100m
+        image:
+          name:
+            _default: cr.yandex/crp3ccidau046kdj8g9q/contour_issues-frontend:716a2b73
+          pullPolicy:
+            _default: IfNotPresent
+        service:
+          enabled: true
+          name:
+            _default: frontend-service
+          type:
+            _default: ClusterIP
+          port:
+            _default: 80
+          targetPort:
+            _default: 80
+          portName:
+            _default: http
+        imagePullSecrets:
+          enabled:
+            _default: true
+          name:
+            _default: regcred

apps/issues/base/frontend-service.yaml

@@ -1,15 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: frontend-svc
-  namespace: issues
-spec:
-  type: ClusterIP
-  selector:
-    app: frontend
-  ports:
-    - name: http
-      port: 80
-      targetPort: 80
-      protocol: TCP

apps/issues/base/kustomization.yaml

@@ -7,7 +7,6 @@ resources:
   - serviceaccount.yaml
   - backend-deployment.yaml
   - celery-deployment.yaml
-  - frontend-deployment.yaml
   - backend-service.yaml
-  - frontend-service.yaml
+  - frontend-helmrelease.yaml
   - production-configmap.yaml

apps/issues/base/production-configmap.yaml

@@ -40,7 +40,7 @@ data:
     DEBUG = False
     # -----------------------------------------------------------------------------
 
-    REVIEW_HOST='http://backend-svc.flows.svc.cluster.local:80'
+    REVIEW_HOST='http://backend-service.flows.svc.cluster.local:8000'
     # -----------------------------------------------------------------------------
     # EXTERNAL SERVICES END
 
@@ -60,10 +60,6 @@ data:
     USE_NOTIFICATIONS = True
 
     # JWT SETTINGS START
-    if not os.environ.get("JWT_PRIVATE_KEY"):
-        os.environ["JWT_PRIVATE_KEY"] = _read_secret_file("/vault/secrets/django-jwt-private")
-    if not os.environ.get("JWT_PUBLIC_KEY"):
-        os.environ["JWT_PUBLIC_KEY"] = _read_secret_file("/vault/secrets/django-jwt-public")
     # ---------------------------------------------------------------------------------------------------------------------
     SIMPLE_JWT_ISSUER = os.getenv("SIMPLE_JWT_ISSUER", default="default_issuer")
 
@@ -126,7 +122,7 @@ data:
 
     AERO_PUBLIC_HOST = os.getenv("AERO_PUBLIC_HOST", default=SAREX_API)
 
-    BASE_AERO_URL = "http://backend-svc.django.svc.cluster.local:80"
+    BASE_AERO_URL = "http://backend-svc.django.svc.cluster.local:8000"
 
     ENVIRONMENT = "production"
 

apps/issues/yc-k8s-test/postgresql.yaml

@@ -91,8 +91,7 @@ spec:
         failureThreshold: 6
       resources:
         requests:
-          cpu: 50m
+          memory: 512Mi
-          memory: 128Mi
       nodeSelector:
         dedicated: db
       tolerations:

apps/mapper/base/deployment.yaml

@@ -99,7 +99,7 @@ spec:
               value: "120"
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
               memory: 128Mi
       imagePullSecrets:
         - name: regcred

apps/mapper/base/service.yaml

@@ -2,13 +2,13 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: backend-svc
+  name: backend-service
   namespace: mapper
 spec:
   type: ClusterIP
   selector:
     app: backend
   ports:
-    - port: 80
+    - port: 8000
       targetPort: 8000
       protocol: TCP

apps/measurements/base/deployment.yaml

@@ -49,7 +49,7 @@ spec:
               value: "false"
           resources:
             requests:
-              cpu: 25m
+              cpu: 500m
-              memory: 128Mi
+              memory: 512Mi
       imagePullSecrets:
         - name: regcred

apps/message-hub/base/deployment.yaml

@@ -17,56 +17,11 @@ spec:
       labels:
         app: message-hub
         service: message-hub
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: "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: message-hub
-        vault.hashicorp.com/agent-inject-secret-message-hub-db: secrets/data/postgresql/apps/message-hub
-        vault.hashicorp.com/agent-inject-template-message-hub-db: |-
-          {{- with secret "secrets/data/postgresql/apps/message-hub" -}}
-          DB_USERNAME={{ index .Data.data "username" }}
-          DB_PASSWORD={{ index .Data.data "password" }}
-          DB_DATABASE=pm_db
-          DB_HOST=postgresql.pm.svc.cluster.local
-          DB_PORT=5432
-          {{- end -}}
-        vault.hashicorp.com/agent-inject-secret-message-hub-s3: secrets/data/minio/apps/message-hub
-        vault.hashicorp.com/agent-inject-template-message-hub-s3: |-
-          {{- with secret "secrets/data/minio/apps/message-hub" -}}
-          S3_HOST={{ index .Data.data.client "endpoint" }}
-          S3_LOGIN={{ index .Data.data "access_key" }}
-          S3_PASSWORD={{ index .Data.data "secret_key" }}
-          {{- $buckets := index .Data.data "buckets" }}
-          S3_BUCKET={{- if gt (len $buckets) 0 -}}{{ index (index $buckets 0) "name" }}{{- else -}}rfi{{- end -}}
-          {{- end -}}
-        vault.hashicorp.com/agent-inject-secret-message-hub-kafka: secrets/data/kafka/apps/message-hub
-        vault.hashicorp.com/agent-inject-template-message-hub-kafka: |-
-          {{- with secret "secrets/data/kafka/apps/message-hub" -}}
-          KAFKA_USERNAME={{ index .Data.data "username" }}
-          KAFKA_PASSWORD={{ index .Data.data "password" }}
-          KAFKA_HOST=kafka-kafka-contour-controller-headless.kafka.svc.cluster.local
-          KAFKA_PORT=9094
-          KAFKA_SECURITY_PROTOCOL={{ index .Data.data.auth "security_protocol" }}
-          KAFKA_SASL_MECHANISM={{ index .Data.data.auth "sasl_mechanism" }}
-          {{- end -}}
     spec:
-      serviceAccountName: message-hub-vault
       containers:
         - name: message-hub
           image: cr.yandex/crp3ccidau046kdj8g9q/message-hub:production_24425472
           imagePullPolicy: IfNotPresent
-          command: ["/bin/bash", "-ec"]
-          args:
-            - |
-              set -a
-              [ -f /vault/secrets/message-hub-db ] && . /vault/secrets/message-hub-db
-              [ -f /vault/secrets/message-hub-s3 ] && . /vault/secrets/message-hub-s3
-              [ -f /vault/secrets/message-hub-kafka ] && . /vault/secrets/message-hub-kafka
-              set +a
-              exec /opt/entrypoint.sh
           ports:
             - name: http
               containerPort: 8000
@@ -79,7 +34,8 @@ spec:
             - name: SETTINGS_MAX_RETRIES
               value: "1"
             - name: SETTINGS_TOPICS
-              value: '{"planning": "pm", "assets": "assets_broadcast", "project_entity": "issues_broadcast"}'
+              value: '{"planning": "pm", "assets": "assets_broadcast", "project_entity":
+                "issues_broadcast"}'
             - name: SETTINGS_PDF_CONVERTER_HOST
               value: http://export-project-service.django.svc.cluster.local:8000
             - name: SAREX_BASE_HOST
@@ -88,9 +44,76 @@ spec:
               value: redis.pm.svc.cluster.local
             - name: CACHE_PORT
               value: "6379"
+            - name: KAFKA_SECURITY_PROTOCOL
+              value: SSL
+            - name: KAFKA_SASL_MECHANISM
+              value: SCRAM-SHA-512
+            - name: KAFKA_SSL_CAFILE
+              value: /usr/local/share/ca-certificates/kafka.crt
+            - name: KAFKA_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  key: username
+                  name: kafka-secret
+            - name: KAFKA_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  key: password
+                  name: kafka-secret
+            - name: KAFKA_PORT
+              valueFrom:
+                secretKeyRef:
+                  key: port
+                  name: kafka-secret
+            - name: KAFKA_HOST
+              valueFrom:
+                secretKeyRef:
+                  key: hostname
+                  name: kafka-secret
+            - name: DB_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  key: username
+                  name: postgresql-secret
+            - name: DB_DATABASE
+              valueFrom:
+                secretKeyRef:
+                  key: database
+                  name: postgresql-secret
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  key: password
+                  name: postgresql-secret
+            - name: DB_PORT
+              valueFrom:
+                secretKeyRef:
+                  key: port
+                  name: postgresql-secret
+            - name: S3_LOGIN
+              valueFrom:
+                secretKeyRef:
+                  key: username
+                  name: s3-secret
+            - name: S3_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  key: password
+                  name: s3-secret
+            - name: S3_BUCKET
+              valueFrom:
+                secretKeyRef:
+                  key: bucket
+                  name: s3-secret
+            - name: S3_HOST
+              valueFrom:
+                secretKeyRef:
+                  key: host
+                  name: s3-secret
+
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 1Gi
       imagePullSecrets:
         - name: regcred

apps/message-hub/base/kustomization.yaml

@@ -4,6 +4,5 @@ kind: Kustomization
 namespace: message-hub
 resources:
   - namespace.yaml
-  - serviceaccount.yaml
   - deployment.yaml
   - service.yaml

apps/message-hub/base/serviceaccount.yaml

@@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: message-hub-vault
-  namespace: message-hub

apps/notes/base/backend-deployment.yaml

@@ -114,7 +114,7 @@ spec:
               value: "5432"
           resources:
             requests:
-              cpu: "25m"
+              cpu: "1"
-              memory: 128Mi
+              memory: 512Mi
       imagePullSecrets:
         - name: regcred

apps/notes/base/frontend-deployment.yaml

@@ -1,58 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: frontend
-  namespace: notes
-  labels:
-    app: frontend
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: frontend
-  template:
-    metadata:
-      labels:
-        app: frontend
-        service: frontend
-    spec:
-      volumes:
-        - name: nginx-configmap
-          configMap:
-            name: nginx-configmap
-            items:
-              - key: nginx.conf
-                path: nginx.conf
-      containers:
-        - name: frontend
-          image: cr.yandex/crp3ccidau046kdj8g9q/notes-frontend:production_0cb0909f
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
-          resources:
-            requests:
-              cpu: 25m
-              memory: 100Mi
-          volumeMounts:
-            - name: nginx-configmap
-              mountPath: /etc/nginx/nginx.conf
-              subPath: nginx.conf
-          livenessProbe:
-            httpGet:
-              path: /ping
-              port: 80
-            initialDelaySeconds: 10
-            periodSeconds: 10
-            failureThreshold: 10
-          readinessProbe:
-            httpGet:
-              path: /ping
-              port: 80
-            initialDelaySeconds: 10
-            periodSeconds: 10
-            failureThreshold: 20
-      imagePullSecrets:
-        - name: regcred