diff --git a/apps/rfi/base/backend-deployment.yaml b/apps/rfi/base/backend-deployment.yaml index 41beb2a..3774db6 100644 --- a/apps/rfi/base/backend-deployment.yaml +++ b/apps/rfi/base/backend-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: rfi - vault.hashicorp.com/agent-inject-secret-rfi-db: secrets/data/postgresql/apps/rfi + vault.hashicorp.com/agent-inject-secret-rfi-db: secrets/data/apps/notes/postgres/rfi vault.hashicorp.com/agent-inject-template-rfi-db: |- - {{- with secret "secrets/data/postgresql/apps/rfi" -}} - DB_HOST=postgresql.rfi.svc.cluster.local - DB_PORT=5432 - DB_NAME=rfi_db + {{- with secret "secrets/data/apps/notes/postgres/rfi" -}} + DB_HOST={{ index .Data.data "host" }} + DB_PORT={{ index .Data.data "port" }} + DB_NAME={{ index .Data.data "database" }} DB_USER={{ index .Data.data "username" }} DB_PASSWORD={{ index .Data.data "password" }} {{- end -}} diff --git a/apps/rfi/base/celery-deployment.yaml b/apps/rfi/base/celery-deployment.yaml index ff7f3a7..e834b14 100644 --- a/apps/rfi/base/celery-deployment.yaml +++ b/apps/rfi/base/celery-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: rfi - vault.hashicorp.com/agent-inject-secret-rfi-db: secrets/data/postgresql/apps/rfi + vault.hashicorp.com/agent-inject-secret-rfi-db: secrets/data/apps/notes/postgres/rfi vault.hashicorp.com/agent-inject-template-rfi-db: |- - {{- with secret "secrets/data/postgresql/apps/rfi" -}} - DB_HOST=postgresql.rfi.svc.cluster.local - DB_PORT=5432 - DB_NAME=rfi_db + {{- with secret "secrets/data/apps/notes/postgres/rfi" -}} + DB_HOST={{ index .Data.data "host" }} + DB_PORT={{ index .Data.data "port" }} + DB_NAME={{ index .Data.data "database" }} DB_USER={{ index .Data.data "username" }} DB_PASSWORD={{ index .Data.data "password" }} {{- end -}} diff --git a/apps/rfi/base/namespace.yaml b/apps/rfi/base/namespace.yaml index b9c1047..0e80d68 100644 --- a/apps/rfi/base/namespace.yaml +++ b/apps/rfi/base/namespace.yaml @@ -5,3 +5,4 @@ metadata: name: rfi labels: istio-injection: enabled + security.deckhouse.io/pod-policy: privileged diff --git a/apps/rfi/d8-ugmk-prod/kustomization.yaml b/apps/rfi/d8-ugmk-prod/kustomization.yaml new file mode 100644 index 0000000..51bc006 --- /dev/null +++ b/apps/rfi/d8-ugmk-prod/kustomization.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: rfi +resources: + - ../base +patches: + - path: patch.yaml + target: + kind: HelmRelease + name: frontend diff --git a/apps/rfi/d8-ugmk-prod/patch.yaml b/apps/rfi/d8-ugmk-prod/patch.yaml new file mode 100644 index 0000000..7acaa37 --- /dev/null +++ b/apps/rfi/d8-ugmk-prod/patch.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: frontend + namespace: rfi +spec: + values: + services: + frontend: + deployment: + replicaCount: + _default: 1 \ No newline at end of file diff --git a/clusters/d8-ugmk-prod/kustomization.yaml b/clusters/d8-ugmk-prod/kustomization.yaml index 8aa0bc9..d33e947 100644 --- a/clusters/d8-ugmk-prod/kustomization.yaml +++ b/clusters/d8-ugmk-prod/kustomization.yaml @@ -23,4 +23,5 @@ resources: - ../../apps/remarks/d8-ugmk-prod - ../../apps/auth-flow/d8-ugmk-prod - ../../apps/notes/d8-ugmk-prod - - ../../apps/workspaces/d8-ugmk-prod \ No newline at end of file + - ../../apps/workspaces/d8-ugmk-prod + - ../../apps/rfi/d8-ugmk-prod \ No newline at end of file