++

KAFKA_SASL_MECHANISM is read from auth.sasl_mechanism when the nested auth
map exists and from the top-level sasl_mechanism otherwise, so the pods start
both before and after kafka/apps/pm switches to creds delivered from the
kafka-topics terraform stack.

CLAUDE.md

@@ -39,7 +39,8 @@
 **Кластер.** `clusters/<cluster>/kustomization.yaml` — плоский список `../../apps/<app>/<cluster>`. Инфраструктура подключается двумя разными способами:
 
 - `d8-ugmk-prod` — прямо в корневом kustomization как `../../infrastructure/<comp>/d8-ugmk-prod`;
-- `brusnika-prod`, `brusnika-stage`, `wb` — через `clusters/<c>/infrastructure/kustomization.yaml`, который ссылается на `../../../infrastructure/<comp>` (резолвится в `base`), а различия лежат в `clusters/<c>/infrastructure/patches/*.yaml`.
+- `brusnika-prod`, `brusnika-stage` — через `clusters/<c>/infrastructure/kustomization.yaml`, который ссылается на оверлеи `../../../infrastructure/<comp>/<c>` (`base` + патч HelmRelease + сопутствующие манифесты компонента);
+- `wb` — через `clusters/wb/infrastructure/kustomization.yaml`, который ссылается на `../../../infrastructure/<comp>` (резолвится в `base`), а различия лежат в `clusters/wb/infrastructure/patches/*.yaml`.
 
 Кластеры: `brusnika-prod`, `brusnika-stage`, `d8-ugmk-prod`, `wb`, `yc-cps-prod`, `yc-ecp`, `yc-infra-prod`, `yc-k8s-test`, `yc-k8s-test-02`, `contour`.
 

apps/ams-sync/brusnika-stage/backend.yaml

@@ -138,6 +138,10 @@ spec:
           - name: KAFKA_SASL_MECHANISM
             value:
               _default: "SCRAM-SHA-512"
+          - name: RESOURCES_INTERNAL_HOST
+            value:
+              _default: "http://iams.iam.svc.cluster.local:8080"
+
         secretEnvs:
           - name: TELEGRAM_TOKEN
             secretName:

apps/attachments/brusnika-stage/backend.yaml

@@ -110,6 +110,10 @@ spec:
           - name: YANDEX_S3_VERIFY
             value:
               _default: "false"
+          - name: YANDEX_S3_USE_SSL
+            value:
+              _default: "false"
+
         secretEnvs:
           - name: DATABASE_HOST
             secretName:

apps/auth-flow/uralkal/helmrelease.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: frontend
+  namespace: auth-flow
+spec:
+  values:
+    services:
+      frontend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/auth-flow/uralkal/kustomization.yaml

@@ -2,3 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: helmrelease.yaml
+    target:
+      kind: HelmRelease
+      name: frontend

apps/bi/base/backend.yaml

@@ -71,9 +71,9 @@ spec:
           resources:
             requests:
               cpu:
-                _default: 500m
+                _default: 25m
               memory:
-                _default: 1Gi
+                _default: 128Mi
 
           probes:
             liveness:

apps/bi/brusnika-stage/frontend.yaml

@@ -37,7 +37,7 @@ spec:
 
         image:
           name:
-            _default: cr.yandex/crp3ccidau046kdj8g9q/bi-frontend:production_afb137d4
+            _default: cr.yandex/crp3ccidau046kdj8g9q/bi-frontend:contour_9cfd1a0b
           pullPolicy:
             _default: IfNotPresent
 

apps/bi/uralkal/backend.yaml

@@ -8,6 +8,11 @@ spec:
   values:
     services:
       main:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null
         envs:
           - name: SETTINGS_DEBUG
             value:

apps/bi/uralkal/frontend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: bi-frontend
+  namespace: bi
+spec:
+  values:
+    services:
+      frontend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/bi/uralkal/kustomization.yaml

@@ -7,3 +7,7 @@ patches:
     target:
       kind: HelmRelease
       name: bi-backend
+  - path: frontend.yaml
+    target:
+      kind: HelmRelease
+      name: bi-frontend

apps/bim/uralkal/backend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: backend
+  namespace: bim
+spec:
+  values:
+    services:
+      backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/bim/uralkal/kustomization.yaml

@@ -2,3 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: backend.yaml
+    target:
+      kind: HelmRelease
+      name: backend

apps/cde/base/cde-flowscallback.yaml

@@ -71,9 +71,9 @@ spec:
           resources:
             requests:
               cpu:
-                _default: 500m
+                _default: 25m
               memory:
-                _default: 1Gi
+                _default: 128Mi
 
           probes:
             liveness:

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

@@ -71,9 +71,9 @@ spec:
           resources:
             requests:
               cpu:
-                _default: "1"
+                _default: 25m
               memory:
-                _default: 1Gi
+                _default: 228Mi
 
           probes:
             liveness:

apps/cde/base/cde.yaml

@@ -71,7 +71,7 @@ spec:
           resources:
             requests:
               cpu:
-                _default: 500m
+                _default: 250m
               memory:
                 _default: 512Mi
 

apps/cde/uralkal/cde-flowscallback.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde-flowscallback
+  namespace: cde
+spec:
+  values:
+    services:
+      cde-flowscallback:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/cde/uralkal/cde-splitpdf.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde-splitpdf
+  namespace: cde
+spec:
+  values:
+    services:
+      cde-splitpdf:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/cde/uralkal/cde-worker-alert.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde-worker-alert
+  namespace: cde
+spec:
+  values:
+    services:
+      cde-worker-alert:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

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

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde-worker-copy
+  namespace: cde
+spec:
+  values:
+    services:
+      cde-worker-copy:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/cde/uralkal/cde-worker-copyv2.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde-worker-copyv2
+  namespace: cde
+spec:
+  values:
+    services:
+      cde-worker-copyv2:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

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

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde-worker-create-versions
+  namespace: cde
+spec:
+  values:
+    services:
+      cde-worker-create-versions:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/cde/uralkal/cde-worker-create-versionsv2.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde-worker-create-versionsv2
+  namespace: cde
+spec:
+  values:
+    services:
+      cde-worker-create-versionsv2:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

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

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde-worker-markings
+  namespace: cde
+spec:
+  values:
+    services:
+      cde-worker-markings:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/cde/uralkal/cde-worker-markingsv2.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde-worker-markingsv2
+  namespace: cde
+spec:
+  values:
+    services:
+      cde-worker-markingsv2:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

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

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde-worker-sign
+  namespace: cde
+spec:
+  values:
+    services:
+      cde-worker-sign:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/cde/uralkal/cde-worker-signv2.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde-worker-signv2
+  namespace: cde
+spec:
+  values:
+    services:
+      cde-worker-signv2:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

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

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde-worker-update-bundles
+  namespace: cde
+spec:
+  values:
+    services:
+      cde-worker-update-bundles:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/cde/uralkal/cde.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cde
+  namespace: cde
+spec:
+  values:
+    services:
+      cde:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/cde/uralkal/kustomization.yaml

@@ -2,3 +2,56 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: cde-flowscallback.yaml
+    target:
+      kind: HelmRelease
+      name: cde-flowscallback
+  - path: cde-splitpdf.yaml
+    target:
+      kind: HelmRelease
+      name: cde-splitpdf
+  - path: cde-worker-alert.yaml
+    target:
+      kind: HelmRelease
+      name: cde-worker-alert
+  - path: cde-worker-copy.yaml
+    target:
+      kind: HelmRelease
+      name: cde-worker-copy
+  - path: cde-worker-copyv2.yaml
+    target:
+      kind: HelmRelease
+      name: cde-worker-copyv2
+  - path: cde-worker-create-versions.yaml
+    target:
+      kind: HelmRelease
+      name: cde-worker-create-versions
+  - path: cde-worker-create-versionsv2.yaml
+    target:
+      kind: HelmRelease
+      name: cde-worker-create-versionsv2
+  - path: cde-worker-markings.yaml
+    target:
+      kind: HelmRelease
+      name: cde-worker-markings
+  - path: cde-worker-markingsv2.yaml
+    target:
+      kind: HelmRelease
+      name: cde-worker-markingsv2
+  - path: cde-worker-sign.yaml
+    target:
+      kind: HelmRelease
+      name: cde-worker-sign
+  - path: cde-worker-signv2.yaml
+    target:
+      kind: HelmRelease
+      name: cde-worker-signv2
+  - path: cde-worker-update-bundles.yaml
+    target:
+      kind: HelmRelease
+      name: cde-worker-update-bundles
+  - path: cde.yaml
+    target:
+      kind: HelmRelease
+      name: cde

apps/checklists/uralkal/helmrelease.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: checklists
+  namespace: checklists
+spec:
+  values:
+    services:
+      checklists:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/checklists/uralkal/kustomization.yaml

@@ -2,3 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: helmrelease.yaml
+    target:
+      kind: HelmRelease
+      name: checklists

apps/comparisons/uralkal/backend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: backend
+  namespace: comparisons
+spec:
+  values:
+    services:
+      backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/comparisons/uralkal/frontend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: frontend
+  namespace: comparisons
+spec:
+  values:
+    services:
+      frontend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/comparisons/uralkal/kustomization.yaml

@@ -2,3 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: backend.yaml
+    target:
+      kind: HelmRelease
+      name: backend
+  - path: frontend.yaml
+    target:
+      kind: HelmRelease
+      name: frontend

apps/control-interface/base/admin-frontend.yaml

@@ -0,0 +1,94 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: admin-frontend
+  namespace: control-interface
+
+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:
+      admin-frontend:
+        enabled: true
+
+        image:
+          name:
+            _default: cr.yandex/crp3ccidau046kdj8g9q/admin-frontend:contour_9dc27b40
+          pullPolicy:
+            _default: IfNotPresent
+
+        deployment:
+          enabled: true
+
+          name:
+            _default: admin-frontend
+
+          replicaCount:
+            _default: 1
+
+          port:
+            _default: 80
+
+          resources:
+            requests:
+              cpu:
+                _default: 100m
+              memory:
+                _default: 100Mi
+
+          probes:
+            liveness:
+              enabled: false
+            readiness:
+              enabled: false
+
+        service:
+          enabled: true
+
+          name:
+            _default: admin-frontend-svc
+
+          type:
+            _default: ClusterIP
+
+          port:
+            _default: 8080
+
+          targetPort:
+            _default: 80
+
+          portName:
+            _default: http
+
+        imagePullSecrets:
+          enabled:
+            _default: true
+          name:
+            _default: regcred
+
+        commitSha: ""
+        gitlabUri: ""
+        gitlabJobUrl: ""
+        owner: ""

apps/control-interface/base/kustomization.yaml

@@ -4,4 +4,5 @@ kind: Kustomization
 namespace: control-interface
 resources:
   - helmrelease.yaml
+  - admin-frontend.yaml
 

apps/control-interface/uralkal/kustomization.yaml

@@ -3,3 +3,4 @@ kind: Kustomization
 resources:
   - ../base
   - namespace.yaml
+  - psql-tools-debug.yaml

apps/control-interface/uralkal/psql-tools-debug.yaml

@@ -0,0 +1,29 @@
+---
+# Отладочный под: ничего не запускает, просто спит. Заходить через
+#   kubectl exec -it -n control-interface deploy/psql-tools-debug -c debug -- sh
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: psql-tools-debug
+  namespace: control-interface
+  labels:
+    app: psql-tools-debug
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: psql-tools-debug
+  template:
+    metadata:
+      labels:
+        app: psql-tools-debug
+    spec:
+      containers:
+        - name: debug
+          image: cr.yandex/crp3ccidau046kdj8g9q/documentations-psql-tools:create-disk
+          imagePullPolicy: IfNotPresent
+          command: ["/bin/sh", "-c"]
+          args:
+            - while true; do sleep 3600; done
+      imagePullSecrets:
+        - name: regcred

apps/cross-section/uralkal/helmrelease.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cross-section-static
+  namespace: cross-section
+spec:
+  values:
+    services:
+      frontend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/cross-section/uralkal/kustomization.yaml

@@ -2,3 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: helmrelease.yaml
+    target:
+      kind: HelmRelease
+      name: cross-section-static

apps/django/brusnika-prod/s3-proxy.yaml

@@ -35,7 +35,7 @@ spec:
 
         image:
           name:
-            _default: cr.yandex/crp3ccidau046kdj8g9q/export-project:prod_37a48176
+            _default: cr.yandex/crp3ccidau046kdj8g9q/s3-proxy:stable
           pullPolicy:
             _default: IfNotPresent
 
@@ -89,7 +89,7 @@ spec:
         envs:
           - name: AWS_API_ENDPOINT
             value:
-              _default: "http://minio-svc.minio.svc.cluster.local:9000"
+              _default: "https://obs.ru-moscow-1.hc.sbercloud.ru"
           - name: APP_PORT
             value:
               _default: "8000"

apps/django/brusnika-stage/celery.yaml

@@ -330,6 +330,14 @@ spec:
           - name: KC_USE_REDIRECT_LOGOUT
             value:
               _default: "True"
+          - name: CACHE_HOST
+            value:
+              _default: "redis.pm.svc.cluster.local"
+
+          - name: RESOURCES_INTERNAL_HOST
+            value:
+              _default: "http://iams.iam.svc.cluster.local:8080"
+
         secretEnvs:
           - name: SERVER_SUPERSET_JWT_SECRET
             secretName:

apps/django/brusnika-stage/export-project.yaml

@@ -88,6 +88,11 @@ spec:
         labels:
           monitoring: prometheus
 
+        envs:
+          - name: TIMEOUT
+            value:
+              _default: "180"
+
         commitSha: ""
         gitlabUri: ""
         gitlabJobUrl: ""

apps/django/brusnika-stage/sarex-backend.yaml

@@ -313,6 +313,18 @@ spec:
           - name: KC_USE_REDIRECT_LOGOUT
             value:
               _default: "True"
+          - name: RESOURCES_INTERNAL_HOST
+            value:
+              _default: "http://iams.iam.svc.cluster.local:8080"
+
+          - name: SERVER_EXTERNAL_FIND_BY_USERNAME_ENABLED
+            value:
+              _default: "True"
+
+          - name: SERVER_EXTERNAL_FIND_BY_EMAIL_ENABLED
+            value:
+              _default: "True"
+
         secretEnvs:
           - name: SERVER_SUPERSET_JWT_SECRET
             secretName:

apps/django/uralkal/backend.yaml

@@ -8,6 +8,11 @@ spec:
   values:
     services:
       backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null
         envs:
           - name: ALLOWED_HOSTS
             value:

apps/django/uralkal/celery.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: celery
+  namespace: django
+spec:
+  values:
+    services:
+      celery:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/django/uralkal/frontend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: frontend
+  namespace: django
+spec:
+  values:
+    services:
+      frontend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/django/uralkal/kustomization.yaml

@@ -19,3 +19,15 @@ patches:
     target:
       kind: HelmRelease
       name: s3-proxy
+  - path: celery.yaml
+    target:
+      kind: HelmRelease
+      name: celery
+  - path: frontend.yaml
+    target:
+      kind: HelmRelease
+      name: frontend
+  - path: srx-admin.yaml
+    target:
+      kind: HelmRelease
+      name: srx-admin-frontend

apps/django/uralkal/srx-admin.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: srx-admin-frontend
+  namespace: django
+spec:
+  values:
+    services:
+      srx-admin:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/django/uralkal/zitadel-configmap.yaml

@@ -8,7 +8,7 @@ data:
     {
       "auth_type": "zitadel",
       "zitadel": {
-        "client_id": "392748423989716183",
+        "client_id": "392748840802936023",
         "host": "https://login.sarex.local.uralkali.com"
       }
     }

apps/django/vad/nginx-configmap.yaml

@@ -60,12 +60,12 @@ data:
                 expires off;
             }
 
-            # location ~^/api/pm/ {
+            location ~^/api/pm/ {
-            #     proxy_http_version 1.1;
+                proxy_http_version 1.1;
-            #     proxy_set_header Connection "";
+                proxy_set_header Connection "";
-            #     proxy_set_header Host $host;
+                proxy_set_header Host $host;
-            #     proxy_pass http://backend-svc.pm.svc.cluster.local:8000;
+                proxy_pass http://backend-svc.pm.svc.cluster.local:8000;
-            # }
+            }
 
             location ~^/api/v1/documents/ {
                 proxy_http_version 1.1;

apps/document-link/uralkal/frontend.yaml

@@ -8,6 +8,11 @@ spec:
   values:
     services:
       frontend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null
         image:
           name:
             _default: cr.yandex/crp3ccidau046kdj8g9q/document-link-frontend:vad_60487abb

apps/documentations/brusnika-prod/api.yaml

@@ -37,7 +37,7 @@ spec:
 
         image:
           name:
-            _default: cr.yandex/crp3ccidau046kdj8g9q/documentations:prod_b34286a7
+            _default: cr.yandex/crp3ccidau046kdj8g9q/documentations:prod_98a23ef5
           pullPolicy:
             _default: IfNotPresent
 
@@ -267,6 +267,15 @@ spec:
           - name: USE_CACHE_IN_FILE_STREAMER
             value:
               _default: "1"
+
+          - name: USE_LEGACY_BIM_FLOW
+            value:
+              _default: "true"
+
+          - name: PUBLIC_LINK_FOLDER_CONNECTOR_ENABLED
+            value:
+              _default: "true"
+
         secretEnvs:
           - name: PUBLIC_KEY
             secretName:

apps/documentations/brusnika-stage/api.yaml

@@ -255,6 +255,34 @@ spec:
           - name: USE_CACHE_IN_FILE_STREAMER
             value:
               _default: "1"
+          - name: USE_LEGACY_BIM_FLOW
+            value:
+              _default: "true"
+
+          - name: USE_ZITADEL
+            value:
+              _default: "0"
+
+          - name: LAST_SLAVE_1_BIM
+            value:
+              _default: "1000000"
+
+          - name: ENABLE_SMTP
+            value:
+              _default: "True"
+
+          - name: ENABLE_MAILGUN
+            value:
+              _default: "False"
+
+          - name: ENABLE_AUTH_JWT_IN_URL
+            value:
+              _default: "false"
+
+          - name: ENABLE_SIGNATURE_IN_URL
+            value:
+              _default: "true"
+
         secretEnvs:
           - name: PUBLIC_KEY
             secretName:

apps/documentations/brusnika-stage/filestream.yaml

@@ -255,6 +255,19 @@ spec:
           - name: USE_CACHE_IN_FILE_STREAMER
             value:
               _default: "1"
+
+          - name: USE_ZITADEL
+            value:
+              _default: "0"
+
+          - name: ENABLE_AUTH_JWT_IN_URL
+            value:
+              _default: "false"
+
+          - name: ENABLE_SIGNATURE_IN_URL
+            value:
+              _default: "true"
+
         secretEnvs:
           - name: PUBLIC_KEY
             secretName:

apps/documentations/brusnika-stage/pdm.yaml

@@ -308,6 +308,14 @@ spec:
           - name: WORKSPACE_URL
             value:
               _default: "http://workspaces-service.workspaces.svc.cluster.local:8000/"
+          - name: BUCKET_NAME
+            value:
+              _default: "attachments-storage"
+
+          - name: PERMISSIONS_FILTER_COMPANIES
+            value:
+              _default: "[1]"
+
         secretEnvs:
           - name: RELEASES_TOKEN
             secretName:

apps/documentations/uralkal/api.yaml

@@ -8,6 +8,14 @@ spec:
   values:
     services:
       backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null
+        image:
+          name:
+            _default: cr.yandex/crp3ccidau046kdj8g9q/documentations-api:contour_8631bb0e
         envs:
           - name: POSTGRES_POOL_SIZE
             value:
@@ -18,6 +26,9 @@ spec:
           - name: ZITADEL_DOMAIN
             value:
               _default: login.sarex.local.uralkali.com
+          - name: ZITADEL_INSECURE_SKIP_VERIFY
+            value:
+              _default: "true"
           - name: USE_ZITADEL
             value:
               _default: "1"

apps/documentations/uralkal/filestream.yaml

@@ -8,10 +8,21 @@ spec:
   values:
     services:
       backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null
+        image:
+          name:
+            _default: cr.yandex/crp3ccidau046kdj8g9q/documentations-api-files:contour_8631bb0e
         envs:
           - name: POSTGRES_POOL_SIZE
             value:
               _default: "20"
+          - name: ZITADEL_INSECURE_SKIP_VERIFY
+            value:
+              _default: "true"
           - name: ZITADEL_ACCOUNT
             value:
               _default: /vault/secrets/documentations-zitadel-account-json

apps/documentations/uralkal/frontend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: frontend
+  namespace: documentations
+spec:
+  values:
+    services:
+      frontend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/documentations/uralkal/hasher.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: documentations-hasher
+  namespace: documentations
+spec:
+  values:
+    services:
+      backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/documentations/uralkal/kustomization.yaml

@@ -15,3 +15,15 @@ patches:
     target:
       kind: HelmRelease
       name: documentations-pdf-markings-amqp
+  - path: frontend.yaml
+    target:
+      kind: HelmRelease
+      name: frontend
+  - path: hasher.yaml
+    target:
+      kind: HelmRelease
+      name: documentations-hasher
+  - path: pdm.yaml
+    target:
+      kind: HelmRelease
+      name: pdm-api

apps/documentations/uralkal/pdf-markings-amqp.yaml

@@ -8,6 +8,11 @@ spec:
   values:
     services:
       backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null
         envs:
           - name: MARKS_APP__LOG_LEVEL
             value:

apps/documentations/uralkal/pdm.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: pdm-api
+  namespace: documentations
+spec:
+  values:
+    services:
+      backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/eav/brusnika-stage/helmrelease.yaml

@@ -166,6 +166,10 @@ spec:
           - name: YC_S3_BUCKET_NAME
             value:
               _default: "eav"
+          - name: KAFKA_ENABLED
+            value:
+              _default: "False"
+
         secretEnvs:
           - name: KAFKA_PASSWORD
             secretName:

apps/eav/uralkal/helmrelease.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: backend
+  namespace: eav
+spec:
+  values:
+    services:
+      backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/eav/uralkal/kustomization.yaml

@@ -2,3 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: helmrelease.yaml
+    target:
+      kind: HelmRelease
+      name: backend

apps/faas/uralkal/backend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: export-reviews
+  namespace: faas
+spec:
+  values:
+    services:
+      backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/faas/uralkal/kustomization.yaml

@@ -2,3 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: backend.yaml
+    target:
+      kind: HelmRelease
+      name: export-reviews

apps/flows/brusnika-stage/backend.yaml

@@ -35,7 +35,7 @@ spec:
 
         image:
           name:
-            _default: cr.yandex/crp3ccidau046kdj8g9q/flows-backend:production_a7dc8216
+            _default: cr.yandex/crp3ccidau046kdj8g9q/flows-backend:production_e8a366a3
           pullPolicy:
             _default: IfNotPresent
 
@@ -225,6 +225,22 @@ spec:
           - name: DOCUMENTATION_TIMEOUT
             value:
               _default: "60"
+          - name: PLANNING_HOST
+            value:
+              _default: "http://backend-service.pm.svc.cluster.local:8000/api/pm/msp"
+
+          - name: PLANNING_USE
+            value:
+              _default: "True"
+
+          - name: PROXY_PATH_PREFIX
+            value:
+              _default: "/flows"
+
+          - name: CHECKLIST_HOST
+            value:
+              _default: "http://checklists-backend-service.checklists.svc.cluster.local:80"
+
         secretEnvs:
           - name: ADMIN_PANEL_SECRET_KEY
             secretName:

apps/flows/brusnika-stage/celery.yaml

@@ -35,7 +35,7 @@ spec:
 
         image:
           name:
-            _default: cr.yandex/crp3ccidau046kdj8g9q/flows-backend_worker:production_a7dc8216
+            _default: cr.yandex/crp3ccidau046kdj8g9q/flows-backend_worker:production_e8a366a3
           pullPolicy:
             _default: IfNotPresent
 
@@ -223,6 +223,34 @@ spec:
           - name: DOCUMENTATION_TIMEOUT
             value:
               _default: "60"
+          - name: FLOWS_HOST
+            value:
+              _default: "http://backend-service.flows.svc.cluster.local:8000"
+
+          - name: RESOURCES_HOST
+            value:
+              _default: "http://iams.iam.svc.cluster.local:8080"
+
+          - name: FLOWS_DB_HOST
+            value:
+              _default: "192.168.2.45"
+
+          - name: FLOWS_DB_PORT
+            value:
+              _default: "5432"
+
+          - name: ISSUES_DB_PORT
+            value:
+              _default: "5432"
+
+          - name: ISSUES_DB_HOST
+            value:
+              _default: "192.168.2.45"
+
+          - name: DJANGO_BASE_HOST
+            value:
+              _default: "https://test.sarex.brusnika.tech"
+
         secretEnvs:
           - name: ADMIN_PANEL_SECRET_KEY
             secretName:

apps/flows/brusnika-stage/frontend.yaml

@@ -35,7 +35,7 @@ spec:
 
         image:
           name:
-            _default: cr.yandex/crp3ccidau046kdj8g9q/flows-frontend:contour_dcc5b5e6
+            _default: cr.yandex/crp3ccidau046kdj8g9q/flows-frontend:contour_ed219085
           pullPolicy:
             _default: IfNotPresent
 

apps/flows/uralkal/backend.yaml

@@ -15,6 +15,11 @@ spec:
   values:
     services:
       backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null
         deployment:
           args:
             _default:
@@ -78,6 +83,10 @@ spec:
             value:
               _default: "0"
           
+          - name: ENABLE_EVENTS
+            value:
+              _default: "0"
+
           - name: ENABLE_METRICS
             value:
               _default: "0"
@@ -134,28 +143,11 @@ spec:
             value:
               _default: "kafka-kafka-contour.kafka.svc.cluster.local:9092"
 
+        secretEnvs:
           - name: KAFKA_SSL_CERT
-            value:
+            secretName:
-              _default: |
+              _default: kafka-kafka-contour-tls
-                -----BEGIN CERTIFICATE-----
+            secretKey: "ca.crt"
-                MIIDETCCAfmgAwIBAgIQNhHkZWgkcMSiuRD9FD3SKjANBgkqhkiG9w0BAQsFADAT
-                MREwDwYDVQQDEwhrYWZrYS1jYTAeFw0yNjA4MjYwOTM4MzFaFw0yNzA4MjYwOTM4
-                MzFaMBMxETAPBgNVBAMTCGthZmthLWNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-                MIIBCgKCAQEA7Vvs1386xYZrKJ4qr/LwiibuhyoIHZm6AnjubChLKUSulP0+TIYC
-                tDgfSiEQsmASCkJKrvrpg2o0TGxj+LUTVnBCDWwBL3wXWSrbHTmpo9y2n0MH/SiN
-                h0n43/ReuXXGzuP+s4WF4Z6EkQyCqqGXZkqYx3PsiqQv2DYmnU/s6jdEqXBhDyU9
-                k6KGjMGxCmDN07E8iElfZp58KvZSISFNi2X5QWa3CIiPo7EKOyW20Hw8xVyQ8/SX
-                GE/Rt2I4G/LC+EhUBKrRB4UgHY1UcifO0EMvKeh8lLRBT5+yqQvkA2/cXYKmeEKc
-                zICZw5ve1DiImjQKvHoM257t6lf5yj9h+wIDAQABo2EwXzAOBgNVHQ8BAf8EBAMC
-                AqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB/wQFMAMB
-                Af8wHQYDVR0OBBYEFAANdtqbrWPSSQqiCh1Wii2jxHO5MA0GCSqGSIb3DQEBCwUA
-                A4IBAQBJOea+5wxUNQuWX+E1m3GA5WJz+mAyt8J37w1ZpFVSpOX9r/ptSjyGoNY2
-                vgP0G8bJH30s25D4kRHuvvPeeCGnOR3PKPceeNIa4CQYvHnYT2bf7WBP8rLd0TyS
-                OV/ApxvxipKjl0OQc+95xAxm2z0qWIeOh1dkurvyhdLasIhqyhuUguW8APB2U3dU
-                fIvJ/R992Hy/MYvW7cw1CMWoaoBX90TEl6JNCHQvfBxaQzvPRvSEWwnRgbGwSZwz
-                ZS6GaNGN7C70WCxP4gmmkWfUC9lphnFb0IMGxXr/nTu5Ez5PKqRG56THkW5vd45i
-                0FC16VuidLG0HUCCawFjRiAg9rIA
-                -----END CERTIFICATE-----
 
         podAnnotations:
           _default:

apps/flows/uralkal/celery.yaml

@@ -1,11 +1,4 @@
 ---
-# Патч celery для контура УГМК — подключение к Kafka.
-#
-# ВНИМАНИЕ: envs — список, kustomize заменяет его ЦЕЛИКОМ (JSON merge patch),
-# поэтому здесь продублирован весь набор из apps/flows/base/celery.yaml.
-# args — тоже список, продублирован весь скрипт с добавленным sourcing flows-kafka.
-# podAnnotations — map, мержится по ключам, поэтому переопределён только
-# один ключ agent-inject-template-flows-kafka; остальные vault-аннотации берутся из base.
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
@@ -15,6 +8,11 @@ spec:
   values:
     services:
       celery:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null
         deployment:
           args:
             _default:
@@ -135,28 +133,11 @@ spec:
             value:
               _default: "kafka-kafka-contour.kafka.svc.cluster.local:9092"
 
+        secretEnvs:
           - name: KAFKA_SSL_CERT
-            value:
+            secretName:
-              _default: |
+              _default: kafka-kafka-contour-tls
-                -----BEGIN CERTIFICATE-----
+            secretKey: "ca.crt"
-                MIIDETCCAfmgAwIBAgIQNhHkZWgkcMSiuRD9FD3SKjANBgkqhkiG9w0BAQsFADAT
-                MREwDwYDVQQDEwhrYWZrYS1jYTAeFw0yNjA4MjYwOTM4MzFaFw0yNzA4MjYwOTM4
-                MzFaMBMxETAPBgNVBAMTCGthZmthLWNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-                MIIBCgKCAQEA7Vvs1386xYZrKJ4qr/LwiibuhyoIHZm6AnjubChLKUSulP0+TIYC
-                tDgfSiEQsmASCkJKrvrpg2o0TGxj+LUTVnBCDWwBL3wXWSrbHTmpo9y2n0MH/SiN
-                h0n43/ReuXXGzuP+s4WF4Z6EkQyCqqGXZkqYx3PsiqQv2DYmnU/s6jdEqXBhDyU9
-                k6KGjMGxCmDN07E8iElfZp58KvZSISFNi2X5QWa3CIiPo7EKOyW20Hw8xVyQ8/SX
-                GE/Rt2I4G/LC+EhUBKrRB4UgHY1UcifO0EMvKeh8lLRBT5+yqQvkA2/cXYKmeEKc
-                zICZw5ve1DiImjQKvHoM257t6lf5yj9h+wIDAQABo2EwXzAOBgNVHQ8BAf8EBAMC
-                AqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB/wQFMAMB
-                Af8wHQYDVR0OBBYEFAANdtqbrWPSSQqiCh1Wii2jxHO5MA0GCSqGSIb3DQEBCwUA
-                A4IBAQBJOea+5wxUNQuWX+E1m3GA5WJz+mAyt8J37w1ZpFVSpOX9r/ptSjyGoNY2
-                vgP0G8bJH30s25D4kRHuvvPeeCGnOR3PKPceeNIa4CQYvHnYT2bf7WBP8rLd0TyS
-                OV/ApxvxipKjl0OQc+95xAxm2z0qWIeOh1dkurvyhdLasIhqyhuUguW8APB2U3dU
-                fIvJ/R992Hy/MYvW7cw1CMWoaoBX90TEl6JNCHQvfBxaQzvPRvSEWwnRgbGwSZwz
-                ZS6GaNGN7C70WCxP4gmmkWfUC9lphnFb0IMGxXr/nTu5Ez5PKqRG56THkW5vd45i
-                0FC16VuidLG0HUCCawFjRiAg9rIA
-                -----END CERTIFICATE-----
 
         podAnnotations:
           _default:

apps/flows/uralkal/frontend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: frontend
+  namespace: flows
+spec:
+  values:
+    services:
+      frontend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/flows/uralkal/kustomization.yaml

@@ -11,3 +11,7 @@ patches:
     target:
       kind: HelmRelease
       name: celery
+  - path: frontend.yaml
+    target:
+      kind: HelmRelease
+      name: frontend

apps/iam/base/backend.yaml

@@ -42,7 +42,7 @@ spec:
 
         image:
           name:
-            _default: cr.yandex/crp3ccidau046kdj8g9q/iams:contour_dada80a8
+            _default: cr.yandex/crp3ccidau046kdj8g9q/iams:contour_29754513
           pullPolicy:
             _default: IfNotPresent
 

apps/iam/brusnika-stage/backend.yaml

@@ -35,7 +35,7 @@ spec:
 
         image:
           name:
-            _default: cr.yandex/crp3ccidau046kdj8g9q/iams:production_786e19c3
+            _default: cr.yandex/crp3ccidau046kdj8g9q/iams:contour_dada80a8
           pullPolicy:
             _default: IfNotPresent
 
@@ -158,6 +158,22 @@ spec:
           - name: KAFKA_TOPIC_COMPANY_RESOURCE_PERMISSIONS
             value:
               _default: "company_resource_permissions"
+          - name: AUTH_ENABLED
+            value:
+              _default: "true"
+
+          - name: ZITADEL_ENABLED
+            value:
+              _default: "false"
+
+          - name: ZITADEL_ORG_RULES_FILE
+            value:
+              _default: "config/zitadel/org-rules-prod.json"
+
+          - name: KAFKA_TOPIC_LEGACY_AMS_SYNC
+            value:
+              _default: "ams-sync"
+
         secretEnvs:
           - name: DB_DSN
             secretName:

apps/iam/uralkal/backend-s3.yaml

@@ -57,6 +57,10 @@ spec:
             value:
               _default: "iam"
 
+          - name: ZITADEL_TLS_INSECURE_SKIP_VERIFY
+            value:
+              _default: "true"
+
           - name: S3_REGION
             value:
               _default: "ru-central1"

apps/inspections/brusnika-stage/backend.yaml

@@ -130,6 +130,94 @@ spec:
           - name: API_ADDRESS
             value:
               _default: "8000"
+          - name: DEBUG
+            value:
+              _default: "false"
+
+          - name: HTTP_APP_HOST
+            value:
+              _default: "0.0.0.0"
+
+          - name: HTTP_APP_PORT
+            value:
+              _default: "8000"
+
+          - name: HTTP_APP_ROOT_PATH
+            value:
+              _default: "/inspections"
+
+          - name: HTTP_APP_WORKERS
+            value:
+              _default: "3"
+
+          - name: HTTP_APP_ADMIN_ENABLE
+            value:
+              _default: "true"
+
+          - name: KAFKA_SSL_CAFILE
+            value:
+              _default: "/usr/local/share/ca-certificates/Yandex/YandexInternalRootCA.crt"
+
+          - name: KAFKA_EAV_ASSETS_TOPIC
+            value:
+              _default: "assets_broadcast"
+
+          - name: JWT_AUTH_ENABLE
+            value:
+              _default: "true"
+
+          - name: NOTIFICATIONS_ENABLE
+            value:
+              _default: "true"
+
+          - name: NOTIFICATIONS_EMAIL_FROM
+            value:
+              _default: "hello@sarex.io"
+
+          - name: SAREX_BACKEND_URL
+            value:
+              _default: "https://test.sarex.brusnika.tech"
+
+          - name: SAREX_BACKEND_TIMEOUT
+            value:
+              _default: "30"
+
+          - name: EAV_URL
+            value:
+              _default: "http://eav-service.eav"
+
+          - name: EAV_TIMEOUT
+            value:
+              _default: "30"
+
+          - name: WORKFLOWS_TIMEOUT
+            value:
+              _default: "30"
+
+          - name: WORKFLOWS_EMAIL_DOCKER_IMAGE
+            value:
+              _default: "cr.yandex/crp3ccidau046kdj8g9q/notification:email"
+
+          - name: MOBILE_APP_CURRENT_VERSION
+            value:
+              _default: "1.0.0"
+
+          - name: MOBILE_APP_RECOMMENDED_VERSION
+            value:
+              _default: "1.0.0"
+
+          - name: MOBILE_APP_REQUIRED_VERSION
+            value:
+              _default: "1.0.0"
+
+          - name: MAILER_URL
+            value:
+              _default: "http://mailer-service.mailer:8000"
+
+          - name: MAILER_TIMEOUT
+            value:
+              _default: "30"
+
         secretEnvs:
           - name: DATABASE_USER
             secretName:

apps/inspections/uralkal/backend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: backend
+  namespace: inspections
+spec:
+  values:
+    services:
+      backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/inspections/uralkal/kustomization.yaml

@@ -2,3 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: backend.yaml
+    target:
+      kind: HelmRelease
+      name: backend

apps/issues/brusnika-stage/backend.yaml

@@ -176,6 +176,10 @@ spec:
           - name: API_ADDRESS
             value:
               _default: "8000"
+          - name: RABBITMQ_HOSTNAME
+            value:
+              _default: "rabbitmq.rabbitmq.svc.cluster.local:5672"
+
         secretEnvs:
           - name: YC_S3_ACCESS_KEY_ID
             secretName:

apps/issues/brusnika-stage/celery.yaml

@@ -187,6 +187,18 @@ spec:
           - name: API_ADDRESS
             value:
               _default: "8000"
+          - name: USE_NOTIFICATIONS
+            value:
+              _default: "True"
+
+          - name: ENABLE_MAILGUN
+            value:
+              _default: "False"
+
+          - name: RABBITMQ_HOSTNAME
+            value:
+              _default: "rabbitmq.rabbitmq.svc.cluster.local:5672"
+
         secretEnvs:
           - name: YC_S3_ACCESS_KEY_ID
             secretName:

apps/issues/uralkal/backend-s3.yaml

@@ -49,11 +49,11 @@ spec:
                 _default: kafka.crt
               readOnly:
                 _default: true
-              configMap:
+              secret:
-                name:
+                secretName:
-                  _default: kafka-ca-cert
+                  _default: kafka-kafka-contour-tls
                 items:
-                  - key: kafka.crt
+                  - key: ca.crt
                     path:
                       _default: kafka.crt
 

apps/issues/uralkal/backend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: backend
+  namespace: issues
+spec:
+  values:
+    services:
+      backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/issues/uralkal/celery-s3.yaml

@@ -49,11 +49,11 @@ spec:
                 _default: kafka.crt
               readOnly:
                 _default: true
-              configMap:
+              secret:
-                name:
+                secretName:
-                  _default: kafka-ca-cert
+                  _default: kafka-kafka-contour-tls
                 items:
-                  - key: kafka.crt
+                  - key: ca.crt
                     path:
                       _default: kafka.crt
 

apps/issues/uralkal/celery.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: celery
+  namespace: issues
+spec:
+  values:
+    services:
+      celery:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/issues/uralkal/frontend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: frontend
+  namespace: issues
+spec:
+  values:
+    services:
+      frontend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/issues/uralkal/kafka-ca-configmap.yaml

@@ -1,27 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: kafka-ca-cert
-  namespace: issues
-data:
-  kafka.crt: |
-    -----BEGIN CERTIFICATE-----
-    MIIDETCCAfmgAwIBAgIQNhHkZWgkcMSiuRD9FD3SKjANBgkqhkiG9w0BAQsFADAT
-    MREwDwYDVQQDEwhrYWZrYS1jYTAeFw0yNjA4MjYwOTM4MzFaFw0yNzA4MjYwOTM4
-    MzFaMBMxETAPBgNVBAMTCGthZmthLWNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-    MIIBCgKCAQEA7Vvs1386xYZrKJ4qr/LwiibuhyoIHZm6AnjubChLKUSulP0+TIYC
-    tDgfSiEQsmASCkJKrvrpg2o0TGxj+LUTVnBCDWwBL3wXWSrbHTmpo9y2n0MH/SiN
-    h0n43/ReuXXGzuP+s4WF4Z6EkQyCqqGXZkqYx3PsiqQv2DYmnU/s6jdEqXBhDyU9
-    k6KGjMGxCmDN07E8iElfZp58KvZSISFNi2X5QWa3CIiPo7EKOyW20Hw8xVyQ8/SX
-    GE/Rt2I4G/LC+EhUBKrRB4UgHY1UcifO0EMvKeh8lLRBT5+yqQvkA2/cXYKmeEKc
-    zICZw5ve1DiImjQKvHoM257t6lf5yj9h+wIDAQABo2EwXzAOBgNVHQ8BAf8EBAMC
-    AqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB/wQFMAMB
-    Af8wHQYDVR0OBBYEFAANdtqbrWPSSQqiCh1Wii2jxHO5MA0GCSqGSIb3DQEBCwUA
-    A4IBAQBJOea+5wxUNQuWX+E1m3GA5WJz+mAyt8J37w1ZpFVSpOX9r/ptSjyGoNY2
-    vgP0G8bJH30s25D4kRHuvvPeeCGnOR3PKPceeNIa4CQYvHnYT2bf7WBP8rLd0TyS
-    OV/ApxvxipKjl0OQc+95xAxm2z0qWIeOh1dkurvyhdLasIhqyhuUguW8APB2U3dU
-    fIvJ/R992Hy/MYvW7cw1CMWoaoBX90TEl6JNCHQvfBxaQzvPRvSEWwnRgbGwSZwz
-    ZS6GaNGN7C70WCxP4gmmkWfUC9lphnFb0IMGxXr/nTu5Ez5PKqRG56THkW5vd45i
-    0FC16VuidLG0HUCCawFjRiAg9rIA
-    -----END CERTIFICATE-----

apps/issues/uralkal/kustomization.yaml

@@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
-  - kafka-ca-configmap.yaml
 patches:
   - path: backend-s3.yaml
     target:
@@ -12,3 +11,15 @@ patches:
     target:
       kind: HelmRelease
       name: celery
+  - path: backend.yaml
+    target:
+      kind: HelmRelease
+      name: backend
+  - path: celery.yaml
+    target:
+      kind: HelmRelease
+      name: celery
+  - path: frontend.yaml
+    target:
+      kind: HelmRelease
+      name: frontend

apps/mapper/uralkal/backend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: backend
+  namespace: mapper
+spec:
+  values:
+    services:
+      backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/mapper/uralkal/kustomization.yaml

@@ -2,3 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: backend.yaml
+    target:
+      kind: HelmRelease
+      name: backend

apps/measurements/uralkal/backend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: measurements
+  namespace: measurements
+spec:
+  values:
+    services:
+      backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/measurements/uralkal/kustomization.yaml

@@ -2,3 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: backend.yaml
+    target:
+      kind: HelmRelease
+      name: measurements

apps/message-hub/uralkal/kafka-ca-configmap.yaml

@@ -1,27 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: kafka-ca-cert
-  namespace: message-hub
-data:
-  kafka.crt: |
-    -----BEGIN CERTIFICATE-----
-    MIIDETCCAfmgAwIBAgIQNhHkZWgkcMSiuRD9FD3SKjANBgkqhkiG9w0BAQsFADAT
-    MREwDwYDVQQDEwhrYWZrYS1jYTAeFw0yNjA4MjYwOTM4MzFaFw0yNzA4MjYwOTM4
-    MzFaMBMxETAPBgNVBAMTCGthZmthLWNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-    MIIBCgKCAQEA7Vvs1386xYZrKJ4qr/LwiibuhyoIHZm6AnjubChLKUSulP0+TIYC
-    tDgfSiEQsmASCkJKrvrpg2o0TGxj+LUTVnBCDWwBL3wXWSrbHTmpo9y2n0MH/SiN
-    h0n43/ReuXXGzuP+s4WF4Z6EkQyCqqGXZkqYx3PsiqQv2DYmnU/s6jdEqXBhDyU9
-    k6KGjMGxCmDN07E8iElfZp58KvZSISFNi2X5QWa3CIiPo7EKOyW20Hw8xVyQ8/SX
-    GE/Rt2I4G/LC+EhUBKrRB4UgHY1UcifO0EMvKeh8lLRBT5+yqQvkA2/cXYKmeEKc
-    zICZw5ve1DiImjQKvHoM257t6lf5yj9h+wIDAQABo2EwXzAOBgNVHQ8BAf8EBAMC
-    AqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB/wQFMAMB
-    Af8wHQYDVR0OBBYEFAANdtqbrWPSSQqiCh1Wii2jxHO5MA0GCSqGSIb3DQEBCwUA
-    A4IBAQBJOea+5wxUNQuWX+E1m3GA5WJz+mAyt8J37w1ZpFVSpOX9r/ptSjyGoNY2
-    vgP0G8bJH30s25D4kRHuvvPeeCGnOR3PKPceeNIa4CQYvHnYT2bf7WBP8rLd0TyS
-    OV/ApxvxipKjl0OQc+95xAxm2z0qWIeOh1dkurvyhdLasIhqyhuUguW8APB2U3dU
-    fIvJ/R992Hy/MYvW7cw1CMWoaoBX90TEl6JNCHQvfBxaQzvPRvSEWwnRgbGwSZwz
-    ZS6GaNGN7C70WCxP4gmmkWfUC9lphnFb0IMGxXr/nTu5Ez5PKqRG56THkW5vd45i
-    0FC16VuidLG0HUCCawFjRiAg9rIA
-    -----END CERTIFICATE-----

apps/message-hub/uralkal/kustomization.yaml

@@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
-  - kafka-ca-configmap.yaml
 patches:
   - path: message-hub.yaml
     target:

apps/message-hub/uralkal/message-hub.yaml

@@ -14,6 +14,11 @@ spec:
   values:
     services:
       backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null
         envs:
           - name: WORKER_TIMEOUT
             value:
@@ -86,11 +91,11 @@ spec:
                 _default: kafka.crt
               readOnly:
                 _default: true
-              configMap:
+              secret:
-                name:
+                secretName:
-                  _default: kafka-ca-cert
+                  _default: kafka-kafka-contour-tls
                 items:
-                  - key: kafka.crt
+                  - key: ca.crt
                     path:
                       _default: kafka.crt
 
@@ -101,5 +106,5 @@ spec:
               {{- with secret "secrets/data/kafka/apps/pm" -}}
               KAFKA_USERNAME={{ index .Data.data "username" }}
               KAFKA_PASSWORD={{ index .Data.data "password" }}
-              KAFKA_SASL_MECHANISM={{ index .Data.data.auth "sasl_mechanism" }}
+              KAFKA_SASL_MECHANISM={{ if .Data.data.auth }}{{ index .Data.data.auth "sasl_mechanism" }}{{ else }}{{ index .Data.data "sasl_mechanism" }}{{ end }}
               {{- end -}}

apps/notes/uralkal/backend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: backend
+  namespace: notes
+spec:
+  values:
+    services:
+      backend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/notes/uralkal/frontend.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: frontend
+  namespace: notes
+spec:
+  values:
+    services:
+      frontend:
+        deployment:
+          resources:
+            requests:
+              cpu: null
+              memory: null

apps/notes/uralkal/kustomization.yaml

@@ -2,3 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../base
+patches:
+  - path: backend.yaml
+    target:
+      kind: HelmRelease
+      name: backend
+  - path: frontend.yaml
+    target:
+      kind: HelmRelease
+      name: frontend