restore buisness owned postgresql from company dumps

2026-06-29 18:45:57 +03:00 · 2026-06-29 18:45:57 +03:00 · 9bfb5cc3b8
commit 9bfb5cc3b8
parent bc8222b5cd
25 changed files with 167 additions and 92 deletions
--- a/apps/attachments/yc-k8s-test/postgresql.yaml
+++ b/apps/attachments/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/bim/yc-k8s-test/postgresql.yaml
+++ b/apps/bim/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -45,7 +45,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/checklists/yc-k8s-test/postgresql.yaml
+++ b/apps/checklists/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/comparisons/yc-k8s-test/postgresql.yaml
+++ b/apps/comparisons/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/contracts/yc-k8s-test/postgresql.yaml
+++ b/apps/contracts/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/django/yc-k8s-test/postgresql.yaml
+++ b/apps/django/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/documentations/yc-k8s-test/postgresql.yaml
+++ b/apps/documentations/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/drawings/yc-k8s-test/postgresql.yaml
+++ b/apps/drawings/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/eav/yc-k8s-test/postgresql.yaml
+++ b/apps/eav/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/flows/yc-k8s-test/postgresql.yaml
+++ b/apps/flows/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/inspections/yc-k8s-test/postgresql.yaml
+++ b/apps/inspections/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/issues/yc-k8s-test/postgresql.yaml
+++ b/apps/issues/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/notes/yc-k8s-test/postgresql.yaml
+++ b/apps/notes/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/pm/yc-k8s-test/postgresql.yaml
+++ b/apps/pm/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/processing/yc-k8s-test/postgresql.yaml
+++ b/apps/processing/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/resources/yc-k8s-test/postgresql.yaml
+++ b/apps/resources/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/rfi/yc-k8s-test/postgresql.yaml
+++ b/apps/rfi/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/subscriptions/yc-k8s-test/postgresql.yaml
+++ b/apps/subscriptions/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/system-log/yc-k8s-test/postgresql.yaml
+++ b/apps/system-log/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/transmittal/yc-k8s-test/postgresql.yaml
+++ b/apps/transmittal/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/apps/workspaces/yc-k8s-test/postgresql.yaml
+++ b/apps/workspaces/yc-k8s-test/postgresql.yaml
@ -9,7 +9,7 @@ spec:
  chart:
    spec:
      chart: postgresql-contour
-      version: "13.0.10"
+      version: "13.0.11"
      sourceRef:
        kind: HelmRepository
        name: yc-oci-charts
@ -44,7 +44,7 @@ spec:
    image:
      registry: cr.yandex/crp3ccidau046kdj8g9q
      repository: contour/postgresql
-      tag: 13.0.10
+      tag: 13.0.11
      pullPolicy: Always
    metrics:
      enabled: false
--- a/infrastructure/s3-proxy/yc-k8s-test/deployment.yaml
+++ b/infrastructure/s3-proxy/yc-k8s-test/deployment.yaml
@ -0,0 +1,105 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: s3-proxy
+  namespace: postgresql
+  labels:
+    app: s3-proxy
+    service: s3proxy
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: s3-proxy
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 25%
+      maxUnavailable: 25%
+  template:
+    metadata:
+      labels:
+        app: s3-proxy
+        service: s3proxy
+      annotations:
+        traffic.sidecar.istio.io/excludeOutboundPorts: "4317,4318,9411"
+        proxy.istio.io/config: |
+          tracing:
+            sampling: 100
+            zipkin:
+              address: signoz-otel-collector-external.signoz.svc.cluster.local:9411
+            custom_tags:
+              k8s.pod.name:
+                environment:
+                  name: POD_NAME
+              k8s.namespace.name:
+                environment:
+                  name: POD_NAMESPACE
+              k8s.pod.ip:
+                environment:
+                  name: INSTANCE_IP
+        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 }}
+    spec:
+      serviceAccountName: postgresql
+      automountServiceAccountToken: true
+      imagePullSecrets:
+        - name: regcred
+      containers:
+        - name: s3proxy
+          image: cr.yandex/crp3ccidau046kdj8g9q/s3-proxy:stable
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 80
+              name: http
+              protocol: TCP
+          env:
+            - name: K8S_POD_UID
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.uid
+            - name: K8S_POD_NAME
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.name
+            - name: K8S_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.namespace
+            - name: OTEL_RESOURCE_ATTRIBUTES
+              value: k8s.pod.uid=$(K8S_POD_UID),k8s.pod.name=$(K8S_POD_NAME),k8s.namespace.name=$(K8S_NAMESPACE)
+            - name: AWS_API_ENDPOINT
+              value: https://storage.yandexcloud.net
+            - name: AWS_S3_BUCKET
+              value: prod-pg-dumps
+            - name: AWS_REGION
+              value: ru-central1
+            - name: AWS_SHARED_CREDENTIALS_FILE
+              value: /vault/secrets/aws-credentials
+            - name: AWS_EC2_METADATA_DISABLED
+              value: "true"
+            - name: ACCESS_LOG
+              value: "true"
+            - name: CORS_ALLOW_HEADERS
+              value: Content-Type, Accept-Ranges, Content-Range, Content-Encoding
+          resources:
+            requests:
+              cpu: 100m
+              memory: 128Mi
+            limits:
+              cpu: 500m
+              memory: 512Mi
--- a/infrastructure/s3-proxy/yc-k8s-test/kustomization.yaml
+++ b/infrastructure/s3-proxy/yc-k8s-test/kustomization.yaml
@ -2,5 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
  - ../base
+  - deployment.yaml
+  - service.yaml
 patches:
  - path: s3-proxy.yaml
--- a/infrastructure/s3-proxy/yc-k8s-test/s3-proxy.yaml
+++ b/infrastructure/s3-proxy/yc-k8s-test/s3-proxy.yaml
@ -4,53 +4,4 @@ metadata:
  name: s3-proxy
  namespace: postgresql
 spec:
-  interval: 5m
-  timeout: 10m
-  values:
-    s3ProxySecret:
-      create: false
-    universal-chart:
-      services:
-        s3proxy:
-          serviceAccount:
-            name:
-              _default: postgresql
-            podAutomountServiceAccountToken:
-              _default: true
-          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: "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: []
+  suspend: true
--- a/infrastructure/s3-proxy/yc-k8s-test/service.yaml
+++ b/infrastructure/s3-proxy/yc-k8s-test/service.yaml
@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: s3-proxy-service
+  namespace: postgresql
+  labels:
+    app: s3-proxy
+    service: s3proxy
+spec:
+  type: ClusterIP
+  selector:
+    app: s3-proxy
+  ports:
+    - name: http
+      port: 80
+      protocol: TCP
+      targetPort: 80