Merge branch 'master' of ssh://158-160-253-227.nip.io:2222/infra/iac

apps/attachments/base/deployment.yaml

@@ -1,70 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: attachments
-  namespace: attachments
-  labels:
-    app: attachments
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: attachments
-  template:
-    metadata:
-      labels:
-        app: attachments
-      annotations:
-        traffic.sidecar.istio.io/excludeOutboundPorts: "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 -}}
-    spec:
-      serviceAccountName: attachments-vault
-      containers:
-        - name: attachments
-          image: cr.yandex/crp3ccidau046kdj8g9q/attachments:feature_6238c882
-          imagePullPolicy: IfNotPresent
-          command: ["/bin/bash", "-ec"]
-          args:
-            - |
-              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
-          ports:
-            - name: http
-              containerPort: 8000
-              protocol: TCP
-          env:
-            - name: POSTGRES_POOL_SIZE
-              value: "10"
-            - name: API_ADDRESS
-              value: 0.0.0.0:8000
-      imagePullSecrets:
-        - name: regcred

apps/attachments/base/helmrelease.yaml

@@ -0,0 +1,112 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: attachments
+  namespace: attachments
+spec:
+  interval: 10m
+  chart:
+    spec:
+      chart: universal-chart
+      version: "0.1.8"
+      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:
+            # Порт Vault 8200 добавлен к дефолтным портам трейсинга — иначе
+            # чарт перезатрёт их одиночным "8200" и SigNoz перестанет ходить.
+            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 -}}

apps/attachments/base/kustomization.yaml

@@ -4,6 +4,4 @@ kind: Kustomization
 namespace: attachments
 resources:
   - namespace.yaml
-  - serviceaccount.yaml
+  - helmrelease.yaml
-  - deployment.yaml
-  - service.yaml

apps/attachments/base/service.yaml

@@ -1,14 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: attachments-service
-  namespace: attachments
-spec:
-  type: ClusterIP
-  selector:
-    app: attachments
-  ports:
-    - port: 8000
-      targetPort: 8000
-      protocol: TCP

apps/attachments/base/serviceaccount.yaml

@@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: attachments-vault
-  namespace: attachments

apps/attachments/yc-k8s-test/kustomization.yaml

@@ -7,5 +7,5 @@ resources:
 patches:
   - path: replicas.yaml
     target:
-      kind: Deployment
+      kind: HelmRelease
       name: attachments

apps/attachments/yc-k8s-test/replicas.yaml

@@ -1,8 +1,13 @@
 ---
-apiVersion: apps/v1
+apiVersion: helm.toolkit.fluxcd.io/v2
-kind: Deployment
+kind: HelmRelease
 metadata:
   name: attachments
   namespace: attachments
 spec:
-  replicas: 1
+  values:
+    services:
+      attachments:
+        deployment:
+          replicaCount:
+            _default: 1