diff --git a/apps/attachments/yc-k8s-test/postgresql.yaml b/apps/attachments/yc-k8s-test/postgresql.yaml index 8bd84b0..7fdbe49 100644 --- 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 diff --git a/apps/bim/yc-k8s-test/postgresql.yaml b/apps/bim/yc-k8s-test/postgresql.yaml index 2d01f4c..dd13a42 100644 --- 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 diff --git a/apps/checklists/yc-k8s-test/postgresql.yaml b/apps/checklists/yc-k8s-test/postgresql.yaml index 66a10af..57ad41e 100644 --- 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 diff --git a/apps/comparisons/yc-k8s-test/postgresql.yaml b/apps/comparisons/yc-k8s-test/postgresql.yaml index 8972d90..4211b06 100644 --- 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 diff --git a/apps/contracts/yc-k8s-test/postgresql.yaml b/apps/contracts/yc-k8s-test/postgresql.yaml index ee080a4..4866403 100644 --- 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 diff --git a/apps/django/yc-k8s-test/postgresql.yaml b/apps/django/yc-k8s-test/postgresql.yaml index 3e16ec8..cf0186a 100644 --- 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 diff --git a/apps/documentations/yc-k8s-test/postgresql.yaml b/apps/documentations/yc-k8s-test/postgresql.yaml index 2d95900..24a1006 100644 --- 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 diff --git a/apps/drawings/yc-k8s-test/postgresql.yaml b/apps/drawings/yc-k8s-test/postgresql.yaml index b8dcdae..1db4efb 100644 --- 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 diff --git a/apps/eav/yc-k8s-test/postgresql.yaml b/apps/eav/yc-k8s-test/postgresql.yaml index 6f7398d..144d7de 100644 --- 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 diff --git a/apps/flows/yc-k8s-test/postgresql.yaml b/apps/flows/yc-k8s-test/postgresql.yaml index fef5984..948f2a4 100644 --- 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 diff --git a/apps/inspections/yc-k8s-test/postgresql.yaml b/apps/inspections/yc-k8s-test/postgresql.yaml index b014ca2..2a171ab 100644 --- 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 diff --git a/apps/issues/yc-k8s-test/postgresql.yaml b/apps/issues/yc-k8s-test/postgresql.yaml index 6adb04b..792e75a 100644 --- 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 diff --git a/apps/notes/yc-k8s-test/postgresql.yaml b/apps/notes/yc-k8s-test/postgresql.yaml index 5440a1b..08c7d71 100644 --- 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 diff --git a/apps/pm/yc-k8s-test/postgresql.yaml b/apps/pm/yc-k8s-test/postgresql.yaml index cf8482c..b94f9e9 100644 --- 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 diff --git a/apps/processing/yc-k8s-test/postgresql.yaml b/apps/processing/yc-k8s-test/postgresql.yaml index c08ddde..6d595be 100644 --- 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 diff --git a/apps/resources/yc-k8s-test/postgresql.yaml b/apps/resources/yc-k8s-test/postgresql.yaml index 761c8db..5ae37b6 100644 --- 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 diff --git a/apps/rfi/yc-k8s-test/postgresql.yaml b/apps/rfi/yc-k8s-test/postgresql.yaml index aa75e9d..46286ed 100644 --- 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 diff --git a/apps/subscriptions/yc-k8s-test/postgresql.yaml b/apps/subscriptions/yc-k8s-test/postgresql.yaml index db642d4..c1794d3 100644 --- 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 diff --git a/apps/system-log/yc-k8s-test/postgresql.yaml b/apps/system-log/yc-k8s-test/postgresql.yaml index 6ad3589..9989d90 100644 --- 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 diff --git a/apps/transmittal/yc-k8s-test/postgresql.yaml b/apps/transmittal/yc-k8s-test/postgresql.yaml index 08340c7..8687929 100644 --- 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 diff --git a/apps/workspaces/yc-k8s-test/postgresql.yaml b/apps/workspaces/yc-k8s-test/postgresql.yaml index 9191522..d44e655 100644 --- 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 diff --git a/infrastructure/s3-proxy/yc-k8s-test/deployment.yaml b/infrastructure/s3-proxy/yc-k8s-test/deployment.yaml new file mode 100644 index 0000000..be8adb2 --- /dev/null +++ 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 diff --git a/infrastructure/s3-proxy/yc-k8s-test/kustomization.yaml b/infrastructure/s3-proxy/yc-k8s-test/kustomization.yaml index 8c20cea..3b7e38b 100644 --- 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 diff --git a/infrastructure/s3-proxy/yc-k8s-test/s3-proxy.yaml b/infrastructure/s3-proxy/yc-k8s-test/s3-proxy.yaml index 68a5f77..02081c1 100644 --- 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 diff --git a/infrastructure/s3-proxy/yc-k8s-test/service.yaml b/infrastructure/s3-proxy/yc-k8s-test/service.yaml new file mode 100644 index 0000000..9639842 --- /dev/null +++ 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