From d9158a6b8abacb63634175b1e8f7cf9aad16e0fa Mon Sep 17 00:00:00 2001
From: Kochetkov S <kochetkov.s@sarex.io>
Date: Fri, 25 Sep 2026 17:27:14 +0300
Subject: [PATCH] ++ uralkal zitadel bundled

---
 infrastructure-secrets.yaml | 31 ++++++++++++++++++++-----------
 infrastructure.yaml         | 10 ----------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/infrastructure-secrets.yaml b/infrastructure-secrets.yaml
index be1ffe8..946ff70 100644
--- a/infrastructure-secrets.yaml
+++ b/infrastructure-secrets.yaml
@@ -5036,7 +5036,13 @@ environments:
             data:
                 infrastructure:
                     postgresql:
-                        enabled: ENC[AES256_GCM,data:W7hCewI=,iv:GocxRsnyea+4go4V0XFkpayjlWTMVVDEpkao3DRiUrg=,tag:YaOLMwTCM7xJKp2yhMyXlA==,type:bool]
+                        admin:
+                            enabled: ENC[AES256_GCM,data:Hz3zRrA=,iv:ZPe5kA1RoFCJxNfNiEoOV4a9ABCA2cHzoeUzlbRKxmI=,tag:19yAU6oLiuM9QWJ2DeI2wQ==,type:bool]
+                        users:
+                            enabled: ENC[AES256_GCM,data:o89ZZg==,iv:np2icjXYRp3HfrXG42mhaJeDIwzALZBjtS6ejjpxoDI=,tag:+btbs93pxH69gqj59qDO/w==,type:bool]
+                        apps:
+                            zitadel:
+                                generate: ENC[AES256_GCM,data:+hW9eA==,iv:c6Z7woYf+J36m4bQw4zr0JxWeUJ/LPdPfUm+JqgEhVU=,tag:eMDbM186xc+eSuxnx0jo4Q==,type:bool]
                     minio:
                         enabled: ENC[AES256_GCM,data:T/vkArg=,iv:JWW7qa6QWzHBKpiHA+ms0rE299tEdTg1dY9gu+DXdP4=,tag:huC+MyryiIEOf8Q2M7p8IA==,type:bool]
                     rabbitmq:
@@ -5099,19 +5105,22 @@ environments:
               depends_on:
                 kafka_ref: main
                 kafka_user: uralkal-test
-            - name: zitadel-postgresql
+            - id: zitadel-postgresql
+              schema: ""
               namespace: zitadel
-              type: database
-              sink: vault
-              vault_path: zitadel/postgresql
-              depends_on:
-                cluster: main
-                db: zitadel
-                user: zitadel
+              ownership: managed
               random_keys:
                 humanPassword:
                     length: 32
                     special: true
+              targets:
+                - kind: vault
+                  path: zitadel/postgresql
+              extra_fields:
+                password:
+                    source:
+                        kind: secret_ref
+                        ref: vault://postgresql/users#zitadel
             - name: superset-postgres
               namespace: superset
               type: database
@@ -5215,8 +5224,8 @@ sops:
             dXRWUzlUOWVYMVdUR2tlREJveWF6SVEK/99wDif8yD2VGEqnCeTT6sunURWU+IEu
             xwlt+WPoox0GUNw4efVFL4E7gd7FDJGtur+8si6i26XufQf2Tsk3xQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-09-25T13:44:07Z"
-    mac: ENC[AES256_GCM,data:osu74g3eiUgSTBB+e2SWWSdKol3eW9U7hIYGwqsgTRDQ5BqqMMHji8hqOQeL6Ed2YMEamiIkKUq/YA8fWXHmXGKyDfhJmbx2/sWNjRww/u7q38r7JF1R/NCQDCr3UZImIsZY6/0sEfockIkEnOU0zu1WGWhCFz4ioMyl1uuErW8=,iv:VRtJ3LKtEnTxdXSYEGNg3rVXA+/NCQkvXDGkOfBNw2w=,tag:Y5NDxtfPs+qSo883VUR3tg==,type:str]
+    lastmodified: "2026-09-25T14:25:28Z"
+    mac: ENC[AES256_GCM,data:7FGdbf8vq1PRO1Vxm8BGimL2dk2F7fma8sp0iQAI0F/EVeDojXSA8XZm0Mt6WuFgUHOTW1CEaR7eOO54F+4/oO5x7oHJZpWvnQZrqTpy9rHK2wW0mE6y4M2ZLbhYqJo9MP4Xp7ZKyPKhagYV2YGx42M8LMWneED1tBkAxzR3eLk=,iv:EHPbNi/CDQ15p71DJWL+yLq3FeWWpu2oe3dN3ibg77k=,tag:++hlRTnpVXYhfVNzRKqa5Q==,type:str]
     pgp: []
     encrypted_regex: ^(data)$
     version: 3.12.2
diff --git a/infrastructure.yaml b/infrastructure.yaml
index fbe9677..a90731f 100644
--- a/infrastructure.yaml
+++ b/infrastructure.yaml
@@ -1253,16 +1253,6 @@ environments:
           password_special: false
           conn_limit: 20
 
-      - cluster_id: main
-        database:
-          name: zitadel
-          extensions: []
-        user:
-          name: zitadel
-          password_length: 32
-          password_special: false
-          conn_limit: 20
-
       - cluster_id: main
         database:
           name: superset