From 182787e33bc7221ee00ca837c19204b45da7d422 Mon Sep 17 00:00:00 2001 From: emelinda Date: Wed, 15 Jul 2026 16:22:37 +0300 Subject: [PATCH] Migrate `srx-admin` from raw manifest definitions to HelmRelease and move from `control-interface` namespace to `django`. Remove deprecated resources and update related configurations. --- .../attachments/d8-ugmk-prod/helmrelease.yaml | 110 ------------------ .../d8-ugmk-prod/kustomization.yaml | 7 +- apps/control-interface/base/deployment.yaml | 29 ----- .../{d8-ugmk-prod => base}/helmrelease.yaml | 4 +- .../control-interface/base/kustomization.yaml | 6 +- apps/control-interface/base/namespace.yaml | 7 -- apps/control-interface/base/service.yaml | 14 --- .../d8-ugmk-prod/kustomization.yaml | 7 +- .../yc-k8s-test/kustomization.yaml | 3 +- .../yc-k8s-test/replicas.yaml | 13 ++- 10 files changed, 28 insertions(+), 172 deletions(-) delete mode 100644 apps/attachments/d8-ugmk-prod/helmrelease.yaml delete mode 100644 apps/control-interface/base/deployment.yaml rename apps/control-interface/{d8-ugmk-prod => base}/helmrelease.yaml (95%) delete mode 100644 apps/control-interface/base/namespace.yaml delete mode 100644 apps/control-interface/base/service.yaml diff --git a/apps/attachments/d8-ugmk-prod/helmrelease.yaml b/apps/attachments/d8-ugmk-prod/helmrelease.yaml deleted file mode 100644 index 5857773..0000000 --- a/apps/attachments/d8-ugmk-prod/helmrelease.yaml +++ /dev/null @@ -1,110 +0,0 @@ ---- -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: attachments - namespace: attachments -spec: - interval: 10m - chart: - spec: - chart: universal-chart - version: "0.1.9" - 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: - attachments: - enabled: true - serviceAccount: - enabled: - _default: true - name: - _default: attachments-vault - deployment: - enabled: true - name: - _default: attachments - replicaCount: - _default: 1 - port: - _default: 8000 - command: - _default: ["/bin/bash", "-ec"] - args: - _default: - - | - set -a - [ -f /vault/secrets/attachments-db ] && . /vault/secrets/attachments-db - [ -f /vault/secrets/attachments-s3 ] && . /vault/secrets/attachments-s3 - set +a - exec /opt/attachments/entrypoint.sh - image: - name: - _default: cr.yandex/crp3ccidau046kdj8g9q/attachments:feature_6238c882 - pullPolicy: - _default: IfNotPresent - service: - enabled: true - name: - _default: attachments-service - type: - _default: ClusterIP - port: - _default: 8000 - targetPort: - _default: 8000 - portName: - _default: http - imagePullSecrets: - enabled: - _default: true - name: - _default: regcred - envs: - - name: POSTGRES_POOL_SIZE - value: - _default: "10" - - name: API_ADDRESS - value: - _default: 0.0.0.0:8000 - podAnnotations: - _default: - traffic.sidecar.istio.io/excludeOutboundPorts: "4317,4318,9411,8200" - 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: attachments - vault.hashicorp.com/agent-inject-secret-attachments-db: secrets/data/postgresql/apps/attachments - vault.hashicorp.com/agent-inject-template-attachments-db: |- - {{- with secret "secrets/data/postgresql/apps/attachments" -}} - DATABASE_HOST=postgresql.attachments.svc.cluster.local - DATABASE_PORT=5432 - DATABASE_NAME=attachments_db - DATABASE_USER={{ index .Data.data "username" }} - DATABASE_PASSWORD={{ index .Data.data "password" }} - DATABASE_SSL_MODE=disable - {{- end -}} - vault.hashicorp.com/agent-inject-secret-attachments-s3: secrets/data/minio/apps/attachments - vault.hashicorp.com/agent-inject-template-attachments-s3: |- - {{- with secret "secrets/data/minio/apps/attachments" -}} - YANDEX_S3_ENDPOINT_URL=minio.minio:9000 - YANDEX_S3_ACCESS_KEY_ID={{ index .Data.data "access_key" }} - YANDEX_S3_SECRET_ACCESS_KEY={{ index .Data.data "secret_key" }} - YANDEX_S3_USE_SSL=false - YANDEX_S3_REGION=ru-central - YANDEX_S3_VERIFY=false - BUCKET_NAME=attachments - {{- end -}} diff --git a/apps/attachments/d8-ugmk-prod/kustomization.yaml b/apps/attachments/d8-ugmk-prod/kustomization.yaml index 3e41a8e..70a0b40 100644 --- a/apps/attachments/d8-ugmk-prod/kustomization.yaml +++ b/apps/attachments/d8-ugmk-prod/kustomization.yaml @@ -3,5 +3,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: attachments resources: - - helmrelease.yaml + - ../base - namespace.yaml +patches: [] +# - path: patch.yaml +# target: +# kind: HelmRelease +# name: attachments diff --git a/apps/control-interface/base/deployment.yaml b/apps/control-interface/base/deployment.yaml deleted file mode 100644 index 914db47..0000000 --- a/apps/control-interface/base/deployment.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: srx-admin - namespace: control-interface - labels: - app: srx-admin -spec: - replicas: 1 - selector: - matchLabels: - app: srx-admin - template: - metadata: - labels: - app: srx-admin - spec: - containers: - - name: srx-admin - image: cr.yandex/crp3ccidau046kdj8g9q/srx-admin:prod_3b9cb250 - imagePullPolicy: IfNotPresent - ports: - - name: http - containerPort: 80 - protocol: TCP - imagePullSecrets: - - name: regcred - diff --git a/apps/control-interface/d8-ugmk-prod/helmrelease.yaml b/apps/control-interface/base/helmrelease.yaml similarity index 95% rename from apps/control-interface/d8-ugmk-prod/helmrelease.yaml rename to apps/control-interface/base/helmrelease.yaml index 44b3af2..0bab467 100644 --- a/apps/control-interface/d8-ugmk-prod/helmrelease.yaml +++ b/apps/control-interface/base/helmrelease.yaml @@ -47,7 +47,9 @@ spec: replicaCount: _default: 1 - + stage: 1 + preprod: 3 + production: 3 port: _default: 80 diff --git a/apps/control-interface/base/kustomization.yaml b/apps/control-interface/base/kustomization.yaml index 1abd7c3..64ff6c5 100644 --- a/apps/control-interface/base/kustomization.yaml +++ b/apps/control-interface/base/kustomization.yaml @@ -1,8 +1,6 @@ --- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: control-interface +namespace: django resources: - - namespace.yaml - - deployment.yaml - - service.yaml + - helmrelease.yaml diff --git a/apps/control-interface/base/namespace.yaml b/apps/control-interface/base/namespace.yaml deleted file mode 100644 index febf860..0000000 --- a/apps/control-interface/base/namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: control-interface - labels: - istio-injection: enabled diff --git a/apps/control-interface/base/service.yaml b/apps/control-interface/base/service.yaml deleted file mode 100644 index d7c0c1d..0000000 --- a/apps/control-interface/base/service.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: frontend-svc - namespace: control-interface -spec: - type: ClusterIP - selector: - app: srx-admin - ports: - - port: 80 - targetPort: 80 - protocol: TCP diff --git a/apps/control-interface/d8-ugmk-prod/kustomization.yaml b/apps/control-interface/d8-ugmk-prod/kustomization.yaml index 39ccef0..6b283c2 100644 --- a/apps/control-interface/d8-ugmk-prod/kustomization.yaml +++ b/apps/control-interface/d8-ugmk-prod/kustomization.yaml @@ -3,5 +3,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: django resources: - - helmrelease.yaml + - ../base - namespace.yaml +patches: [] +# - path: patch.yaml +# target: +# kind: HelmRelease +# name: srx-admin diff --git a/apps/control-interface/yc-k8s-test/kustomization.yaml b/apps/control-interface/yc-k8s-test/kustomization.yaml index 5c65d7e..1409ba9 100644 --- a/apps/control-interface/yc-k8s-test/kustomization.yaml +++ b/apps/control-interface/yc-k8s-test/kustomization.yaml @@ -1,10 +1,11 @@ --- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: django resources: - ../base patches: - path: replicas.yaml target: - kind: Deployment + kind: HelmRelease name: srx-admin diff --git a/apps/control-interface/yc-k8s-test/replicas.yaml b/apps/control-interface/yc-k8s-test/replicas.yaml index af3c901..9b697c3 100644 --- a/apps/control-interface/yc-k8s-test/replicas.yaml +++ b/apps/control-interface/yc-k8s-test/replicas.yaml @@ -1,8 +1,13 @@ --- -apiVersion: apps/v1 -kind: Deployment +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease metadata: name: srx-admin - namespace: control-interface + namespace: django spec: - replicas: 1 + values: + services: + frontend: + deployment: + replicaCount: + _default: 1