From 68e29f2030a8dd11d9aa11618657edb9749a1949 Mon Sep 17 00:00:00 2001 From: Nick Phura Date: Tue, 19 Mar 2024 10:49:43 -0700 Subject: [PATCH] Bump test and prod deployment resources. Minor type cleanup (copy from sims) --- api/.pipeline/config.js | 12 ++++++------ api/src/repositories/user-repository.ts | 4 ++-- app/.pipeline/config.js | 12 ++++++------ database/.pipeline/config.js | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/api/.pipeline/config.js b/api/.pipeline/config.js index 6bec4abcc..bbd291e2b 100644 --- a/api/.pipeline/config.js +++ b/api/.pipeline/config.js @@ -119,11 +119,11 @@ const phases = { logLevel: 'info', nodeOptions: '--max_old_space_size=2250', // 75% of memoryLimit (bytes) cpuRequest: '50m', - cpuLimit: '1000m', + cpuLimit: '1750m', memoryRequest: '100Mi', - memoryLimit: '3Gi', + memoryLimit: '6Gi', replicas: '2', - replicasMax: '4' + replicasMax: '2' }, prod: { namespace: 'a0ec71-prod', @@ -148,11 +148,11 @@ const phases = { logLevel: 'warn', nodeOptions: '--max_old_space_size=2250', // 75% of memoryLimit (bytes) cpuRequest: '50m', - cpuLimit: '1000m', + cpuLimit: '1750m', memoryRequest: '100Mi', - memoryLimit: '3Gi', + memoryLimit: '8Gi', replicas: '2', - replicasMax: '4' + replicasMax: '2' } }; diff --git a/api/src/repositories/user-repository.ts b/api/src/repositories/user-repository.ts index 46d49c6e1..6f91f9021 100644 --- a/api/src/repositories/user-repository.ts +++ b/api/src/repositories/user-repository.ts @@ -22,8 +22,8 @@ export type SystemUser = z.infer; export const SystemUserExtended = SystemUser.extend({ identity_source: z.string(), - role_ids: z.array(z.number()).default([]), - role_names: z.array(z.string()).default([]) + role_ids: z.array(z.number()), + role_names: z.array(z.string()) }); export type SystemUserExtended = z.infer; diff --git a/app/.pipeline/config.js b/app/.pipeline/config.js index 7172cc5e0..150de5026 100644 --- a/app/.pipeline/config.js +++ b/app/.pipeline/config.js @@ -108,11 +108,11 @@ const phases = { env: 'test', sso: config.sso.test, cpuRequest: '50m', - cpuLimit: '400m', + cpuLimit: '500m', memoryRequest: '100Mi', - memoryLimit: '400Mi', + memoryLimit: '1Gi', replicas: '2', - replicasMax: '3' + replicasMax: '2' }, prod: { namespace: 'a0ec71-prod', @@ -131,11 +131,11 @@ const phases = { env: 'prod', sso: config.sso.prod, cpuRequest: '50m', - cpuLimit: '400m', + cpuLimit: '500m', memoryRequest: '100Mi', - memoryLimit: '400Mi', + memoryLimit: '1Gi', replicas: '2', - replicasMax: '3' + replicasMax: '2' } }; diff --git a/database/.pipeline/config.js b/database/.pipeline/config.js index 8b640e3e4..549857574 100644 --- a/database/.pipeline/config.js +++ b/database/.pipeline/config.js @@ -98,9 +98,9 @@ const phases = { dbSetupDockerfilePath: dbSetupDockerfilePath, volumeCapacity: '3Gi', cpuRequest: '50m', - cpuLimit: '500m', + cpuLimit: '2000m', memoryRequest: '100Mi', - memoryLimit: '3Gi', + memoryLimit: '5Gi', replicas: '1' }, prod: { @@ -117,9 +117,9 @@ const phases = { dbSetupDockerfilePath: dbSetupDockerfilePath, volumeCapacity: '5Gi', cpuRequest: '50m', - cpuLimit: '500m', + cpuLimit: '2000m', memoryRequest: '100Mi', - memoryLimit: '3Gi', + memoryLimit: '8Gi', replicas: '1' } };