From 2431ff6ca5fdb65f833347a70a7c423d71fa149a Mon Sep 17 00:00:00 2001 From: deal-machine <95deal@gmail.com> Date: Mon, 13 May 2024 18:04:00 -0300 Subject: [PATCH] wip: message broker --- .env.production | 1 + k8s/api-configmap.yaml | 10 ++++++---- k8s/api-deployment.yaml | 1 + k8s/api-hpa.yaml | 3 ++- k8s/api-service.yaml | 1 + src/external/infra/database/connections.ts | 1 + src/internal/application/configs/env.ts | 1 + 7 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.env.production b/.env.production index 89eb603..ff9845a 100644 --- a/.env.production +++ b/.env.production @@ -6,6 +6,7 @@ DB_PORT=5432 DB_PASSWORD=postgres DB_NAME=postgres DB_DIALECT=postgres +DB_SCHEMA=monolith CACHE_HOST=redis CACHE_PORT=6379 MP_URL=https://api.mercadopago.com diff --git a/k8s/api-configmap.yaml b/k8s/api-configmap.yaml index 6b2cff7..cd22bac 100644 --- a/k8s/api-configmap.yaml +++ b/k8s/api-configmap.yaml @@ -2,15 +2,17 @@ apiVersion: v1 kind: ConfigMap metadata: name: api-configmap + namespace: orderly data: PORT: "3000" NODE_ENV: "production" - DB_HOST: "${DB_IP}" # db-service - DB_USERNAME: "${DB_USERNAME}" # "postgres" + DB_HOST: db-service # "${DB_IP}" + DB_USERNAME: "postgres" # "${DB_USERNAME}" DB_PORT: "5432" - DB_PASSWORD: "${DB_PASSWORD}" # "postgres" - DB_NAME: "${DB_NAME}" # postgres + DB_PASSWORD: "postgres" # "${DB_PASSWORD}" + DB_NAME: postgres # "${DB_NAME}" DB_DIALECT: postgres + DB_SHEMA: "monolith" CACHE_HOST: cache-service CACHE_PORT: "6379" MP_URL: "https://api.mercadopago.com" diff --git a/k8s/api-deployment.yaml b/k8s/api-deployment.yaml index b431f1b..f9e8b56 100644 --- a/k8s/api-deployment.yaml +++ b/k8s/api-deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: api-deployment + namespace: orderly spec: replicas: 1 selector: diff --git a/k8s/api-hpa.yaml b/k8s/api-hpa.yaml index a7a3e85..62f2f41 100644 --- a/k8s/api-hpa.yaml +++ b/k8s/api-hpa.yaml @@ -1,7 +1,8 @@ -apiVersion: autoscaling/v2 +apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler metadata: name: api-hpa + namespace: orderly spec: scaleTargetRef: apiVersion: apps/v1 diff --git a/k8s/api-service.yaml b/k8s/api-service.yaml index a21097e..fa4a309 100644 --- a/k8s/api-service.yaml +++ b/k8s/api-service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: api-service + namespace: orderly spec: type: ClusterIP selector: diff --git a/src/external/infra/database/connections.ts b/src/external/infra/database/connections.ts index 8c0f2ea..1057990 100644 --- a/src/external/infra/database/connections.ts +++ b/src/external/infra/database/connections.ts @@ -6,6 +6,7 @@ const conn = { database: env.dbName, username: env.dbUser, password: env.dbPassword, + schema: env.dbSchema, port: env.dbPort, logging: false, sync: { force: true }, diff --git a/src/internal/application/configs/env.ts b/src/internal/application/configs/env.ts index 405d7bc..6ed78ac 100644 --- a/src/internal/application/configs/env.ts +++ b/src/internal/application/configs/env.ts @@ -7,6 +7,7 @@ export const env = { dbUser: String(process.env.DB_USERNAME), dbPassword: String(process.env.DB_PASSWORD), dbDialect: String(process.env.DB_DIALECT), + dbSchema: String(process.env.DB_SCHEMA), cacheHost: String(process.env.CACHE_HOST), cachePort: Number(process.env.CACHE_PORT),