From 5c43502cbac30925c2225d43c9d89bd20bdd90a4 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 28 Jul 2026 17:05:43 +0500 Subject: [PATCH] ++ --- apps/documentations/base/api-deployment.yaml | 10 +++++----- apps/documentations/base/filestream-deployment.yaml | 10 +++++----- apps/documentations/base/namespace.yaml | 1 + apps/documentations/base/pdm-deployment.yaml | 10 +++++----- apps/documentations/d8-ugmk-prod/kustomization.yaml | 6 ++++++ clusters/d8-ugmk-prod/kustomization.yaml | 3 ++- 6 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 apps/documentations/d8-ugmk-prod/kustomization.yaml diff --git a/apps/documentations/base/api-deployment.yaml b/apps/documentations/base/api-deployment.yaml index 6936e09..d73a8b8 100644 --- a/apps/documentations/base/api-deployment.yaml +++ b/apps/documentations/base/api-deployment.yaml @@ -24,12 +24,12 @@ spec: vault.hashicorp.com/agent-pre-populate-only: "true" vault.hashicorp.com/auth-path: auth/kubernetes vault.hashicorp.com/role: documentations - vault.hashicorp.com/agent-inject-secret-documentations-postgresql: secrets/data/postgresql/apps/documentations + vault.hashicorp.com/agent-inject-secret-documentations-postgresql: secrets/data/apps/documentations/postgres vault.hashicorp.com/agent-inject-template-documentations-postgresql: |- - {{- with secret "secrets/data/postgresql/apps/documentations" -}} - POSTGRES_ADDRESS=postgresql.documentations.svc.cluster.local - POSTGRES_PORT=5432 - POSTGRES_DB=documentations_db + {{- with secret "secrets/data/apps/documentations/postgres" -}} + POSTGRES_ADDRESS={{ index .Data.data "host" }} + POSTGRES_PORT={{ index .Data.data "port" }} + POSTGRES_DB={{ index .Data.data "database" }} POSTGRES_USER={{ index .Data.data "username" }} POSTGRES_PASSWORD={{ index .Data.data "password" }} {{- end -}} diff --git a/apps/documentations/base/filestream-deployment.yaml b/apps/documentations/base/filestream-deployment.yaml index 7111545..6eb1ad7 100644 --- a/apps/documentations/base/filestream-deployment.yaml +++ b/apps/documentations/base/filestream-deployment.yaml @@ -24,12 +24,12 @@ spec: vault.hashicorp.com/agent-pre-populate-only: "true" vault.hashicorp.com/auth-path: auth/kubernetes vault.hashicorp.com/role: documentations - vault.hashicorp.com/agent-inject-secret-documentations-postgresql: secrets/data/postgresql/apps/documentations + vault.hashicorp.com/agent-inject-secret-documentations-postgresql: secrets/data/apps/documentations/postgres vault.hashicorp.com/agent-inject-template-documentations-postgresql: |- - {{- with secret "secrets/data/postgresql/apps/documentations" -}} - POSTGRES_ADDRESS=postgresql.documentations.svc.cluster.local - POSTGRES_PORT=5432 - POSTGRES_DB=documentations_db + {{- with secret "secrets/data/apps/documentations/postgres" -}} + POSTGRES_ADDRESS={{ index .Data.data "host" }} + POSTGRES_PORT={{ index .Data.data "port" }} + POSTGRES_DB={{ index .Data.data "database" }} POSTGRES_USER={{ index .Data.data "username" }} POSTGRES_PASSWORD={{ index .Data.data "password" }} {{- end -}} diff --git a/apps/documentations/base/namespace.yaml b/apps/documentations/base/namespace.yaml index 1f0a0fd..5dff44f 100644 --- a/apps/documentations/base/namespace.yaml +++ b/apps/documentations/base/namespace.yaml @@ -5,3 +5,4 @@ metadata: name: documentations labels: istio-injection: enabled + security.deckhouse.io/pod-policy: privileged diff --git a/apps/documentations/base/pdm-deployment.yaml b/apps/documentations/base/pdm-deployment.yaml index 3266161..4f42858 100644 --- a/apps/documentations/base/pdm-deployment.yaml +++ b/apps/documentations/base/pdm-deployment.yaml @@ -24,12 +24,12 @@ spec: vault.hashicorp.com/agent-pre-populate-only: "true" vault.hashicorp.com/auth-path: auth/kubernetes vault.hashicorp.com/role: documentations - vault.hashicorp.com/agent-inject-secret-documentations-postgresql: secrets/data/postgresql/apps/documentations + vault.hashicorp.com/agent-inject-secret-documentations-postgresql: secrets/data/apps/documentations/postgres vault.hashicorp.com/agent-inject-template-documentations-postgresql: |- - {{- with secret "secrets/data/postgresql/apps/documentations" -}} - POSTGRES_ADDRESS=postgresql.documentations.svc.cluster.local - POSTGRES_PORT=5432 - POSTGRES_DB=documentations_db + {{- with secret "secrets/data/apps/documentations/postgres" -}} + POSTGRES_ADDRESS={{ index .Data.data "host" }} + POSTGRES_PORT={{ index .Data.data "port" }} + POSTGRES_DB={{ index .Data.data "database" }} POSTGRES_USER={{ index .Data.data "username" }} POSTGRES_PASSWORD={{ index .Data.data "password" }} {{- end -}} diff --git a/apps/documentations/d8-ugmk-prod/kustomization.yaml b/apps/documentations/d8-ugmk-prod/kustomization.yaml new file mode 100644 index 0000000..87e17f7 --- /dev/null +++ b/apps/documentations/d8-ugmk-prod/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: documentations +resources: + - ../base \ No newline at end of file diff --git a/clusters/d8-ugmk-prod/kustomization.yaml b/clusters/d8-ugmk-prod/kustomization.yaml index 4618829..ee902b6 100644 --- a/clusters/d8-ugmk-prod/kustomization.yaml +++ b/clusters/d8-ugmk-prod/kustomization.yaml @@ -26,4 +26,5 @@ resources: - ../../apps/workspaces/d8-ugmk-prod - ../../apps/rfi/d8-ugmk-prod - ../../apps/eav/d8-ugmk-prod - - ../../apps/django/d8-ugmk-prod \ No newline at end of file + - ../../apps/django/d8-ugmk-prod + - ../../apps/documentations/d8-ugmk-prod \ No newline at end of file