From 1565d9550ea8363d04966a7611aaa19e57c2c4f3 Mon Sep 17 00:00:00 2001 From: Kochetkov S Date: Mon, 29 Jun 2026 17:53:54 +0300 Subject: [PATCH] restore buisness owned postgresql from company dumps --- apps/attachments/yc-k8s-test/postgresql.yaml | 5 ++- apps/checklists/yc-k8s-test/postgresql.yaml | 7 ++- apps/comparisons/yc-k8s-test/postgresql.yaml | 5 ++- apps/contracts/yc-k8s-test/postgresql.yaml | 11 +++-- apps/django/yc-k8s-test/postgresql.yaml | 6 ++- .../yc-k8s-test/postgresql.yaml | 9 ++-- apps/drawings/yc-k8s-test/postgresql.yaml | 7 ++- apps/eav/yc-k8s-test/postgresql.yaml | 12 ++++-- apps/flows/yc-k8s-test/postgresql.yaml | 8 ++-- apps/inspections/yc-k8s-test/postgresql.yaml | 10 +++-- apps/issues/yc-k8s-test/postgresql.yaml | 7 +-- apps/notes/yc-k8s-test/postgresql.yaml | 8 ++-- apps/pm/yc-k8s-test/postgresql.yaml | 9 ++-- apps/processing/yc-k8s-test/postgresql.yaml | 5 ++- apps/resources/yc-k8s-test/postgresql.yaml | 11 ++--- apps/rfi/yc-k8s-test/postgresql.yaml | 6 ++- .../subscriptions/yc-k8s-test/postgresql.yaml | 10 +++-- apps/system-log/yc-k8s-test/postgresql.yaml | 8 +++- apps/transmittal/yc-k8s-test/postgresql.yaml | 10 ++--- apps/workspaces/yc-k8s-test/postgresql.yaml | 8 ++-- .../s3-proxy/yc-k8s-test/s3-proxy.yaml | 43 ++++++++++++++++++- 21 files changed, 144 insertions(+), 61 deletions(-) diff --git a/apps/attachments/yc-k8s-test/postgresql.yaml b/apps/attachments/yc-k8s-test/postgresql.yaml index 3b51fb2..8bd84b0 100644 --- a/apps/attachments/yc-k8s-test/postgresql.yaml +++ b/apps/attachments/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements" + sharedPreloadLibraries: "" vault: enabled: true role: postgresql @@ -116,6 +116,7 @@ spec: user: attachments passwordKey: attachments extensions: [] - restoreFromDump: false + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/attachments/288/attachments_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/checklists/yc-k8s-test/postgresql.yaml b/apps/checklists/yc-k8s-test/postgresql.yaml index 0d27e68..66a10af 100644 --- a/apps/checklists/yc-k8s-test/postgresql.yaml +++ b/apps/checklists/yc-k8s-test/postgresql.yaml @@ -115,7 +115,10 @@ spec: - name: checklists_db user: checklists passwordKey: checklists - extensions: [] - restoreFromDump: false + extensions: + - pg_stat_statements + - uuid-ossp + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/checklists/288/checklists_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/comparisons/yc-k8s-test/postgresql.yaml b/apps/comparisons/yc-k8s-test/postgresql.yaml index 116f6f9..8972d90 100644 --- a/apps/comparisons/yc-k8s-test/postgresql.yaml +++ b/apps/comparisons/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements,uuid-ossp" + sharedPreloadLibraries: "" vault: enabled: true role: postgresql @@ -116,6 +116,7 @@ spec: user: comparisons passwordKey: comparisons extensions: [] - restoreFromDump: false + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/comparisons/288/comparisons_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/contracts/yc-k8s-test/postgresql.yaml b/apps/contracts/yc-k8s-test/postgresql.yaml index d889048..ee080a4 100644 --- a/apps/contracts/yc-k8s-test/postgresql.yaml +++ b/apps/contracts/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements,uuid-ossp" + sharedPreloadLibraries: "btree_gist,ltree,pg_stat_statements,uuid-ossp" vault: enabled: true role: postgresql @@ -115,7 +115,12 @@ spec: - name: contracts_db user: contracts passwordKey: contracts - extensions: [] - restoreFromDump: false + extensions: + - btree_gist + - ltree + - pg_stat_statements + - uuid-ossp + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/contracts/288/contracts_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/django/yc-k8s-test/postgresql.yaml b/apps/django/yc-k8s-test/postgresql.yaml index 0e7e96a..3e16ec8 100644 --- a/apps/django/yc-k8s-test/postgresql.yaml +++ b/apps/django/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements" + sharedPreloadLibraries: "ltree,pg_stat_statements" vault: enabled: true role: postgresql @@ -116,7 +116,9 @@ spec: user: sarex passwordKey: sarex extensions: + - ltree - pg_stat_statements - restoreFromDump: false + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/sarex_db/288/sarex_db_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/documentations/yc-k8s-test/postgresql.yaml b/apps/documentations/yc-k8s-test/postgresql.yaml index 152dde0..2d95900 100644 --- a/apps/documentations/yc-k8s-test/postgresql.yaml +++ b/apps/documentations/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements,ltree,timescaledb,uuid-ossp" + sharedPreloadLibraries: "ltree,pg_stat_statements,timescaledb,uuid-ossp" vault: enabled: true role: postgresql @@ -115,11 +115,12 @@ spec: - name: documentations_db user: documentations passwordKey: documentations - extensions: - - pg_stat_statements + extensions: - ltree + - pg_stat_statements - timescaledb - uuid-ossp - restoreFromDump: false + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/documentations/288/documentations_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/drawings/yc-k8s-test/postgresql.yaml b/apps/drawings/yc-k8s-test/postgresql.yaml index 5e6d034..b8dcdae 100644 --- a/apps/drawings/yc-k8s-test/postgresql.yaml +++ b/apps/drawings/yc-k8s-test/postgresql.yaml @@ -115,7 +115,10 @@ spec: - name: drawings_db user: drawings passwordKey: drawings - extensions: [] - restoreFromDump: false + extensions: + - pg_stat_statements + - uuid-ossp + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/drawings/288/drawings_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/eav/yc-k8s-test/postgresql.yaml b/apps/eav/yc-k8s-test/postgresql.yaml index 45ad830..6f7398d 100644 --- a/apps/eav/yc-k8s-test/postgresql.yaml +++ b/apps/eav/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements,uuid-ossp,ltree,postgis" + sharedPreloadLibraries: "ltree,pg_stat_statements,postgis,timescaledb,uuid-ossp" vault: enabled: true role: postgresql @@ -115,7 +115,13 @@ spec: - name: eav_db user: eav passwordKey: eav - extensions: [] - restoreFromDump: false + extensions: + - ltree + - pg_stat_statements + - postgis + - timescaledb + - uuid-ossp + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/eav/288/eav_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/flows/yc-k8s-test/postgresql.yaml b/apps/flows/yc-k8s-test/postgresql.yaml index d5a0082..fef5984 100644 --- a/apps/flows/yc-k8s-test/postgresql.yaml +++ b/apps/flows/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements,uuid-ossp,ltree,postgis" + sharedPreloadLibraries: "pg_stat_statements" vault: enabled: true role: postgresql @@ -115,7 +115,9 @@ spec: - name: flows_db user: flows passwordKey: flow - extensions: [] - restoreFromDump: false + extensions: + - pg_stat_statements + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/restored_flow_db/288/restored_flow_db_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/inspections/yc-k8s-test/postgresql.yaml b/apps/inspections/yc-k8s-test/postgresql.yaml index 6957fa2..b014ca2 100644 --- a/apps/inspections/yc-k8s-test/postgresql.yaml +++ b/apps/inspections/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "postgis, timescaledb, pg_stat_statements" + sharedPreloadLibraries: "ltree,pg_stat_statements,postgis,timescaledb,uuid-ossp" vault: enabled: true role: postgresql @@ -115,11 +115,13 @@ spec: - name: inspections_db user: inspections passwordKey: inspections - extensions: + extensions: + - ltree + - pg_stat_statements - postgis - timescaledb - - ltree - uuid-ossp - restoreFromDump: false + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/inspections/288/inspections_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/issues/yc-k8s-test/postgresql.yaml b/apps/issues/yc-k8s-test/postgresql.yaml index 2270990..6adb04b 100644 --- a/apps/issues/yc-k8s-test/postgresql.yaml +++ b/apps/issues/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements,uuid-ossp,ltree,postgis" + sharedPreloadLibraries: "ltree,pg_stat_statements,postgis,timescaledb,uuid-ossp,pg_trgm" vault: enabled: true role: postgresql @@ -118,10 +118,11 @@ spec: extensions: - ltree - pg_stat_statements - - pg_trgm - postgis - timescaledb - uuid-ossp - restoreFromDump: false + - pg_trgm + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/issues/288/issues_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/notes/yc-k8s-test/postgresql.yaml b/apps/notes/yc-k8s-test/postgresql.yaml index a60f2b9..5440a1b 100644 --- a/apps/notes/yc-k8s-test/postgresql.yaml +++ b/apps/notes/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements,uuid-ossp" + sharedPreloadLibraries: "pg_stat_statements" vault: enabled: true role: postgresql @@ -115,7 +115,9 @@ spec: - name: notes_db user: notes passwordKey: notes - extensions: [] - restoreFromDump: false + extensions: + - pg_stat_statements + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/notes/288/notes_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/pm/yc-k8s-test/postgresql.yaml b/apps/pm/yc-k8s-test/postgresql.yaml index 81c7075..cf8482c 100644 --- a/apps/pm/yc-k8s-test/postgresql.yaml +++ b/apps/pm/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements,ltree" + sharedPreloadLibraries: "ltree,pg_stat_statements" vault: enabled: true role: postgresql @@ -115,7 +115,10 @@ spec: - name: pm_db user: pm passwordKey: pm - extensions: [] - restoreFromDump: false + extensions: + - ltree + - pg_stat_statements + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/pm_db/288/pm_db_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/processing/yc-k8s-test/postgresql.yaml b/apps/processing/yc-k8s-test/postgresql.yaml index 8b426f4..c08ddde 100644 --- a/apps/processing/yc-k8s-test/postgresql.yaml +++ b/apps/processing/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements" + sharedPreloadLibraries: "uuid-ossp" vault: enabled: true role: postgresql @@ -117,6 +117,7 @@ spec: passwordKey: workflow extensions: - uuid-ossp - restoreFromDump: false + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/processing/288/processing_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/resources/yc-k8s-test/postgresql.yaml b/apps/resources/yc-k8s-test/postgresql.yaml index 1e3a48e..761c8db 100644 --- a/apps/resources/yc-k8s-test/postgresql.yaml +++ b/apps/resources/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements,uuid-ossp,ltree,postgis" + sharedPreloadLibraries: "ltree,pg_stat_statements,postgis" vault: enabled: true role: postgresql @@ -115,10 +115,11 @@ spec: - name: resources_db user: resources passwordKey: resources - extensions: - - postgis + extensions: - ltree - - uuid-ossp - restoreFromDump: false + - pg_stat_statements + - postgis + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/resources/288/resources_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/rfi/yc-k8s-test/postgresql.yaml b/apps/rfi/yc-k8s-test/postgresql.yaml index 7574264..aa75e9d 100644 --- a/apps/rfi/yc-k8s-test/postgresql.yaml +++ b/apps/rfi/yc-k8s-test/postgresql.yaml @@ -115,7 +115,9 @@ spec: - name: rfi_db user: rfi passwordKey: rfi - extensions: [] - restoreFromDump: false + extensions: + - pg_stat_statements + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/rfi/288/rfi_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/subscriptions/yc-k8s-test/postgresql.yaml b/apps/subscriptions/yc-k8s-test/postgresql.yaml index 5208a2f..db642d4 100644 --- a/apps/subscriptions/yc-k8s-test/postgresql.yaml +++ b/apps/subscriptions/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "postgis" + sharedPreloadLibraries: "ltree,pg_stat_statements,postgis,timescaledb" vault: enabled: true role: postgresql @@ -115,8 +115,12 @@ spec: - name: subscriptions_db user: subscriptions passwordKey: subscriptions - extensions: + extensions: + - ltree + - pg_stat_statements - postgis - restoreFromDump: false + - timescaledb + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/subscriptions/288/subscriptions_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/system-log/yc-k8s-test/postgresql.yaml b/apps/system-log/yc-k8s-test/postgresql.yaml index 7764606..6ad3589 100644 --- a/apps/system-log/yc-k8s-test/postgresql.yaml +++ b/apps/system-log/yc-k8s-test/postgresql.yaml @@ -115,7 +115,11 @@ spec: - name: system_log_db user: system_log passwordKey: system-log - extensions: [] - restoreFromDump: false + extensions: + - ltree + - pg_stat_statements + - timescaledb + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/system-log/288/system-log_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/transmittal/yc-k8s-test/postgresql.yaml b/apps/transmittal/yc-k8s-test/postgresql.yaml index 903a726..08340c7 100644 --- a/apps/transmittal/yc-k8s-test/postgresql.yaml +++ b/apps/transmittal/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements,uuid-ossp,ltree,postgis" + sharedPreloadLibraries: "pg_stat_statements" vault: enabled: true role: postgresql @@ -116,12 +116,8 @@ spec: user: transmittal passwordKey: transmittal extensions: - - ltree - pg_stat_statements - - pg_trgm - - postgis - - timescaledb - - uuid-ossp - restoreFromDump: false + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/transmittal/288/transmittal_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/apps/workspaces/yc-k8s-test/postgresql.yaml b/apps/workspaces/yc-k8s-test/postgresql.yaml index af7b448..9191522 100644 --- a/apps/workspaces/yc-k8s-test/postgresql.yaml +++ b/apps/workspaces/yc-k8s-test/postgresql.yaml @@ -103,7 +103,7 @@ spec: contour: enabled: true adminUser: "postgres" - sharedPreloadLibraries: "pg_stat_statements,uuid-ossp" + sharedPreloadLibraries: "uuid-ossp" vault: enabled: true role: postgresql @@ -115,7 +115,9 @@ spec: - name: workspaces_db user: workspaces passwordKey: workspaces - extensions: [] - restoreFromDump: false + extensions: + - uuid-ossp + restoreFromDump: true + dumpKey: "sanitized_dumps_multi/workspaces/288/workspaces_company288_20260626T202844Z.tar.gz" s3-proxy: endpointUrl: "s3-proxy-service.postgresql.svc.cluster.local" diff --git a/infrastructure/s3-proxy/yc-k8s-test/s3-proxy.yaml b/infrastructure/s3-proxy/yc-k8s-test/s3-proxy.yaml index 6e11bc4..387c568 100644 --- a/infrastructure/s3-proxy/yc-k8s-test/s3-proxy.yaml +++ b/infrastructure/s3-proxy/yc-k8s-test/s3-proxy.yaml @@ -7,10 +7,51 @@ spec: interval: 5m timeout: 10m values: + s3ProxySecret: + create: false universal-chart: services: s3proxy: + serviceAccount: + name: + _default: postgresql + podAutomountServiceAccountToken: + _default: true + deployment: + podAnnotations: + _default: + 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: "postgresql" + vault.hashicorp.com/agent-inject-secret-aws-credentials: "secrets/data/postgresql/s3" + vault.hashicorp.com/agent-inject-template-aws-credentials: | + {{- with secret "secrets/data/postgresql/s3" -}} + [default] + aws_access_key_id={{ .Data.data.access_key }} + aws_secret_access_key={{ .Data.data.secret_key }} + {{- end }} envs: - name: AWS_API_ENDPOINT value: - _default: "http://minio-minio-contour.minio.svc.cluster.local:9000" + _default: "https://storage.yandexcloud.net" + - name: AWS_S3_BUCKET + value: + _default: "prod-pg-dumps" + - name: AWS_REGION + value: + _default: "ru-central1" + - name: AWS_SHARED_CREDENTIALS_FILE + value: + _default: "/vault/secrets/aws-credentials" + - name: AWS_EC2_METADATA_DISABLED + value: + _default: "true" + - name: ACCESS_LOG + value: + _default: "true" + - name: CORS_ALLOW_HEADERS + value: + _default: "Content-Type, Accept-Ranges, Content-Range, Content-Encoding" + secretEnvs: []