diff --git a/apps/django/base/backend-deployment.yaml b/apps/django/base/backend-deployment.yaml index fe3dd44..2490de6 100644 --- a/apps/django/base/backend-deployment.yaml +++ b/apps/django/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: django - vault.hashicorp.com/agent-inject-secret-django-postgresql: secrets/data/postgresql/apps/django + vault.hashicorp.com/agent-inject-secret-django-postgresql: secrets/data/apps/django/postgres vault.hashicorp.com/agent-inject-template-django-postgresql: |- - {{- with secret "secrets/data/postgresql/apps/django" -}} - DJANGO_POSTGRES_HOST=postgresql.django.svc.cluster.local - DJANGO_POSTGRES_PORTS=5432 - DJANGO_POSTGRES_DATABASE=sarex_db + {{- with secret "secrets/data/apps/django/postgres" -}} + DJANGO_POSTGRES_HOST={{ index .Data.data "host" }} + DJANGO_POSTGRES_PORTS={{ index .Data.data "port" }} + DJANGO_POSTGRES_DATABASE={{ index .Data.data "database" }} DJANGO_POSTGRES_USER={{ index .Data.data "username" }} DJANGO_POSTGRES_PASSWORD={{ index .Data.data "password" }} {{- end -}} diff --git a/apps/django/base/celery-deployment.yaml b/apps/django/base/celery-deployment.yaml index b95c2da..47dbcd9 100644 --- a/apps/django/base/celery-deployment.yaml +++ b/apps/django/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: django - vault.hashicorp.com/agent-inject-secret-django-postgresql: secrets/data/postgresql/apps/django + vault.hashicorp.com/agent-inject-secret-django-postgresql: secrets/data/apps/django/postgres vault.hashicorp.com/agent-inject-template-django-postgresql: |- - {{- with secret "secrets/data/postgresql/apps/django" -}} - DJANGO_POSTGRES_HOST=postgresql.django.svc.cluster.local - DJANGO_POSTGRES_PORTS=5432 - DJANGO_POSTGRES_DATABASE=sarex_db + {{- with secret "secrets/data/apps/django/postgres" -}} + DJANGO_POSTGRES_HOST={{ index .Data.data "host" }} + DJANGO_POSTGRES_PORTS={{ index .Data.data "port" }} + DJANGO_POSTGRES_DATABASE={{ index .Data.data "database" }} DJANGO_POSTGRES_USER={{ index .Data.data "username" }} DJANGO_POSTGRES_PASSWORD={{ index .Data.data "password" }} {{- end -}} diff --git a/apps/django/d8-ugmk-prod/kustomization.yaml b/apps/django/d8-ugmk-prod/kustomization.yaml new file mode 100644 index 0000000..4956ad3 --- /dev/null +++ b/apps/django/d8-ugmk-prod/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: django +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 0bac459..4618829 100644 --- a/clusters/d8-ugmk-prod/kustomization.yaml +++ b/clusters/d8-ugmk-prod/kustomization.yaml @@ -25,4 +25,5 @@ resources: - ../../apps/notes/d8-ugmk-prod - ../../apps/workspaces/d8-ugmk-prod - ../../apps/rfi/d8-ugmk-prod - - ../../apps/eav/d8-ugmk-prod \ No newline at end of file + - ../../apps/eav/d8-ugmk-prod + - ../../apps/django/d8-ugmk-prod \ No newline at end of file