diff --git a/apps/attachments/d8-ugmk-prod/kustomization.yaml b/apps/attachments/d8-ugmk-prod/kustomization.yaml index dbe5d57..6fae072 100644 --- a/apps/attachments/d8-ugmk-prod/kustomization.yaml +++ b/apps/attachments/d8-ugmk-prod/kustomization.yaml @@ -4,8 +4,8 @@ kind: Kustomization namespace: attachments resources: - ../base -patches: [] -# - path: patch.yaml -# target: -# kind: HelmRelease -# name: attachments +patches: + - path: patch.yaml + target: + kind: HelmRelease + name: attachments diff --git a/apps/attachments/d8-ugmk-prod/namespace.yaml b/apps/attachments/d8-ugmk-prod/namespace.yaml deleted file mode 100644 index b689e35..0000000 --- a/apps/attachments/d8-ugmk-prod/namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: attachments - labels: - istio-injection: disabled - security.deckhouse.io/pod-policy: privileged diff --git a/apps/attachments/d8-ugmk-prod/patch.yaml b/apps/attachments/d8-ugmk-prod/patch.yaml new file mode 100644 index 0000000..10a7049 --- /dev/null +++ b/apps/attachments/d8-ugmk-prod/patch.yaml @@ -0,0 +1,35 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: attachments + namespace: attachments +spec: + values: + services: + attachments: + podAnnotations: + _default: + 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={{ index .Data.data "host" }} + DATABASE_PORT={{ index .Data.data "port" }} + DATABASE_NAME={{ index .Data.data "database" }} + 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/clusters/d8-ugmk-prod/kustomization.yaml b/clusters/d8-ugmk-prod/kustomization.yaml index 16f3cee..666f104 100644 --- a/clusters/d8-ugmk-prod/kustomization.yaml +++ b/clusters/d8-ugmk-prod/kustomization.yaml @@ -17,7 +17,7 @@ resources: - ./bootstrap-jobs # apps -# - ../../apps/attachments/d8-ugmk-prod + - ../../apps/attachments/d8-ugmk-prod - ../../apps/control-interface/d8-ugmk-prod - ../../apps/cross-section/d8-ugmk-prod - ../../apps/reviews/d8-ugmk-prod