From c13fd916c3ba51b3ca9ce1aa15a6dc2d79fd7beb Mon Sep 17 00:00:00 2001 From: brynjarorng Date: Fri, 13 Dec 2024 13:22:08 +0000 Subject: [PATCH] chore: allow staging to scale down more (#17227) * chore: allow staging to scale down more * chore: nx format:write update dirty files * set overrides to 3 * fixed tests --------- Co-authored-by: andes-it Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- charts/identity-server/values.staging.yaml | 70 ++++---- charts/islandis/values.staging.yaml | 162 +++++++++--------- charts/judicial-system/values.staging.yaml | 24 +-- .../values.staging.yaml | 10 +- .../values.staging.yaml | 10 +- .../values.staging.yaml | 10 +- charts/services/api/values.staging.yaml | 10 +- .../values.staging.yaml | 10 +- .../auth-admin-web/values.staging.yaml | 10 +- .../consultation-portal/values.staging.yaml | 10 +- .../judicial-system-api/values.staging.yaml | 10 +- .../values.staging.yaml | 10 +- .../values.staging.yaml | 4 +- .../services/license-api/values.staging.yaml | 10 +- .../portals-admin/values.staging.yaml | 10 +- .../values.staging.yaml | 4 +- .../service-portal-api/values.staging.yaml | 10 +- .../service-portal/values.staging.yaml | 10 +- .../values.staging.yaml | 10 +- .../values.staging.yaml | 10 +- .../services-auth-ids-api/values.staging.yaml | 10 +- .../values.staging.yaml | 10 +- .../values.staging.yaml | 10 +- .../values.staging.yaml | 10 +- .../values.staging.yaml | 10 +- .../values.staging.yaml | 10 +- .../services-sessions/values.staging.yaml | 4 +- .../values.staging.yaml | 10 +- .../skilavottord-web/values.staging.yaml | 10 +- .../values.staging.yaml | 4 +- charts/services/web/values.staging.yaml | 10 +- infra/src/dsl/basic.spec.ts | 2 +- infra/src/dsl/hpa.spec.ts | 2 +- .../output-generators/map-to-helm-values.ts | 24 ++- 34 files changed, 274 insertions(+), 266 deletions(-) diff --git a/charts/identity-server/values.staging.yaml b/charts/identity-server/values.staging.yaml index b02c94cd26d5..7f6ac4dcf3fb 100644 --- a/charts/identity-server/values.staging.yaml +++ b/charts/identity-server/values.staging.yaml @@ -36,8 +36,8 @@ auth-admin-web: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/auth-admin-web' ingress: @@ -59,9 +59,9 @@ auth-admin-web: progressDeadlineSeconds: 1200 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -270,8 +270,8 @@ services-auth-admin-api: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-auth-admin-api' ingress: @@ -289,9 +289,9 @@ services-auth-admin-api: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -369,8 +369,8 @@ services-auth-delegation-api: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-auth-delegation-api' ingress: @@ -387,9 +387,9 @@ services-auth-delegation-api: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -476,8 +476,8 @@ services-auth-ids-api: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 15 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-auth-ids-api' initContainer: @@ -522,9 +522,9 @@ services-auth-ids-api: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 15 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '800m' @@ -660,8 +660,8 @@ services-auth-personal-representative: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-auth-personal-representative' ingress: @@ -678,9 +678,9 @@ services-auth-personal-representative: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -729,8 +729,8 @@ services-auth-personal-representative-public: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-auth-personal-representative-public' ingress: @@ -747,9 +747,9 @@ services-auth-personal-representative-public: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -824,8 +824,8 @@ services-auth-public-api: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-auth-public-api' ingress: @@ -846,9 +846,9 @@ services-auth-public-api: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/islandis/values.staging.yaml b/charts/islandis/values.staging.yaml index 2cd78ddb6714..541ee602df90 100644 --- a/charts/islandis/values.staging.yaml +++ b/charts/islandis/values.staging.yaml @@ -35,8 +35,8 @@ air-discount-scheme-api: cpuAverageUtilization: 90 nginxRequestsIrate: 20 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/air-discount-scheme-api' ingress: @@ -58,9 +58,9 @@ air-discount-scheme-api: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -123,8 +123,8 @@ air-discount-scheme-backend: cpuAverageUtilization: 90 nginxRequestsIrate: 20 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/air-discount-scheme-backend' ingress: @@ -170,9 +170,9 @@ air-discount-scheme-backend: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -223,8 +223,8 @@ air-discount-scheme-web: cpuAverageUtilization: 90 nginxRequestsIrate: 20 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/air-discount-scheme-web' ingress: @@ -249,9 +249,9 @@ air-discount-scheme-web: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '200m' @@ -440,8 +440,8 @@ api: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 50 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/api' ingress: @@ -460,9 +460,9 @@ api: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 50 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '1200m' @@ -713,8 +713,8 @@ application-system-api: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 60 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/application-system-api' ingress: @@ -763,9 +763,9 @@ application-system-api: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 60 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '600m' @@ -1023,8 +1023,8 @@ consultation-portal: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 30 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/consultation-portal' ingress: @@ -1043,9 +1043,9 @@ consultation-portal: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 30 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -1471,8 +1471,8 @@ license-api: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/license-api' ingress: @@ -1489,9 +1489,9 @@ license-api: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -1576,8 +1576,8 @@ portals-admin: cpuAverageUtilization: 90 nginxRequestsIrate: 8 replicas: - max: 30 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/portals-admin' ingress: @@ -1596,9 +1596,9 @@ portals-admin: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 30 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -1742,7 +1742,7 @@ search-indexer-service: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 1 + max: 3 min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-search-indexer' @@ -1820,7 +1820,7 @@ search-indexer-service: pvcs: [] replicaCount: default: 1 - max: 1 + max: 3 min: 1 resources: limits: @@ -1873,8 +1873,8 @@ service-portal: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 30 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/service-portal' ingress: @@ -1893,9 +1893,9 @@ service-portal: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 30 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '300m' @@ -1962,8 +1962,8 @@ service-portal-api: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 30 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-user-profile' ingress: @@ -2005,9 +2005,9 @@ service-portal-api: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 30 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '800m' @@ -2080,8 +2080,8 @@ services-bff-portals-admin: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-bff' ingress: @@ -2103,9 +2103,9 @@ services-bff-portals-admin: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -2166,8 +2166,8 @@ services-bff-portals-my-pages: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-bff' ingress: @@ -2189,9 +2189,9 @@ services-bff-portals-my-pages: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -2323,7 +2323,7 @@ services-sessions: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 + max: 3 min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-sessions' @@ -2342,7 +2342,7 @@ services-sessions: pvcs: [] replicaCount: default: 1 - max: 10 + max: 3 min: 1 resources: limits: @@ -2565,8 +2565,8 @@ services-university-gateway: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-university-gateway' ingress: @@ -2621,9 +2621,9 @@ services-university-gateway: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '200m' @@ -2755,8 +2755,8 @@ skilavottord-web: cpuAverageUtilization: 90 nginxRequestsIrate: 8 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/skilavottord-web' ingress: @@ -2775,9 +2775,9 @@ skilavottord-web: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -3155,7 +3155,7 @@ user-notification-worker: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 2 + max: 3 min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-user-notification' @@ -3190,7 +3190,7 @@ user-notification-worker: pvcs: [] replicaCount: default: 1 - max: 2 + max: 3 min: 1 resources: limits: @@ -3251,8 +3251,8 @@ web: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 50 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/web' ingress: @@ -3271,9 +3271,9 @@ web: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 50 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '1000m' diff --git a/charts/judicial-system/values.staging.yaml b/charts/judicial-system/values.staging.yaml index e6b543a61ce6..6939b5a9fae4 100644 --- a/charts/judicial-system/values.staging.yaml +++ b/charts/judicial-system/values.staging.yaml @@ -53,8 +53,8 @@ judicial-system-api: cpuAverageUtilization: 90 nginxRequestsIrate: 8 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/judicial-system-api' ingress: @@ -78,9 +78,9 @@ judicial-system-api: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '350m' @@ -155,8 +155,8 @@ judicial-system-backend: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/judicial-system-backend' initContainer: @@ -189,9 +189,9 @@ judicial-system-backend: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' @@ -413,7 +413,7 @@ judicial-system-scheduler: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 1 + max: 3 min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/judicial-system-scheduler' @@ -425,7 +425,7 @@ judicial-system-scheduler: pvcs: [] replicaCount: default: 1 - max: 1 + max: 3 min: 1 resources: limits: diff --git a/charts/services/air-discount-scheme-api/values.staging.yaml b/charts/services/air-discount-scheme-api/values.staging.yaml index 03dae66f38f1..b3ffdaf667ff 100644 --- a/charts/services/air-discount-scheme-api/values.staging.yaml +++ b/charts/services/air-discount-scheme-api/values.staging.yaml @@ -46,8 +46,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 20 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/air-discount-scheme-api' ingress: @@ -69,9 +69,9 @@ podSecurityContext: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/air-discount-scheme-backend/values.staging.yaml b/charts/services/air-discount-scheme-backend/values.staging.yaml index 2e45fbac3401..503a736d94f1 100644 --- a/charts/services/air-discount-scheme-backend/values.staging.yaml +++ b/charts/services/air-discount-scheme-backend/values.staging.yaml @@ -57,8 +57,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 20 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/air-discount-scheme-backend' ingress: @@ -104,9 +104,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/air-discount-scheme-web/values.staging.yaml b/charts/services/air-discount-scheme-web/values.staging.yaml index d160667b9dd5..7185fc6bcd41 100644 --- a/charts/services/air-discount-scheme-web/values.staging.yaml +++ b/charts/services/air-discount-scheme-web/values.staging.yaml @@ -45,8 +45,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 20 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/air-discount-scheme-web' ingress: @@ -71,9 +71,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '200m' diff --git a/charts/services/api/values.staging.yaml b/charts/services/api/values.staging.yaml index d200690c8557..53c6e7b18726 100644 --- a/charts/services/api/values.staging.yaml +++ b/charts/services/api/values.staging.yaml @@ -189,8 +189,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 50 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/api' ingress: @@ -209,9 +209,9 @@ podSecurityContext: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 50 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '1200m' diff --git a/charts/services/application-system-api/values.staging.yaml b/charts/services/application-system-api/values.staging.yaml index c47d9cd07c30..4b37d4cb9945 100644 --- a/charts/services/application-system-api/values.staging.yaml +++ b/charts/services/application-system-api/values.staging.yaml @@ -156,8 +156,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 60 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/application-system-api' ingress: @@ -206,9 +206,9 @@ podSecurityContext: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 60 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '600m' diff --git a/charts/services/auth-admin-web/values.staging.yaml b/charts/services/auth-admin-web/values.staging.yaml index 846c0af6c998..44ac2b27f2d8 100644 --- a/charts/services/auth-admin-web/values.staging.yaml +++ b/charts/services/auth-admin-web/values.staging.yaml @@ -47,8 +47,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/auth-admin-web' ingress: @@ -70,9 +70,9 @@ podDisruptionBudget: progressDeadlineSeconds: 1200 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/consultation-portal/values.staging.yaml b/charts/services/consultation-portal/values.staging.yaml index e3547fb54d2e..198c3aefabfb 100644 --- a/charts/services/consultation-portal/values.staging.yaml +++ b/charts/services/consultation-portal/values.staging.yaml @@ -46,8 +46,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 30 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/consultation-portal' ingress: @@ -66,9 +66,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 30 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/judicial-system-api/values.staging.yaml b/charts/services/judicial-system-api/values.staging.yaml index 7533d12090a6..8ec818a14e50 100644 --- a/charts/services/judicial-system-api/values.staging.yaml +++ b/charts/services/judicial-system-api/values.staging.yaml @@ -53,8 +53,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 8 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/judicial-system-api' ingress: @@ -78,9 +78,9 @@ podSecurityContext: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '350m' diff --git a/charts/services/judicial-system-backend/values.staging.yaml b/charts/services/judicial-system-backend/values.staging.yaml index 30787a83c52d..a4c0268de4d4 100644 --- a/charts/services/judicial-system-backend/values.staging.yaml +++ b/charts/services/judicial-system-backend/values.staging.yaml @@ -68,8 +68,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/judicial-system-backend' initContainer: @@ -102,9 +102,9 @@ podSecurityContext: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/judicial-system-scheduler/values.staging.yaml b/charts/services/judicial-system-scheduler/values.staging.yaml index b62035e69488..c05114e58282 100644 --- a/charts/services/judicial-system-scheduler/values.staging.yaml +++ b/charts/services/judicial-system-scheduler/values.staging.yaml @@ -50,7 +50,7 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 1 + max: 3 min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/judicial-system-scheduler' @@ -62,7 +62,7 @@ podSecurityContext: pvcs: [] replicaCount: default: 1 - max: 1 + max: 3 min: 1 resources: limits: diff --git a/charts/services/license-api/values.staging.yaml b/charts/services/license-api/values.staging.yaml index 6e7db7b9814d..81577da0aa8e 100644 --- a/charts/services/license-api/values.staging.yaml +++ b/charts/services/license-api/values.staging.yaml @@ -56,8 +56,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/license-api' ingress: @@ -74,9 +74,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/portals-admin/values.staging.yaml b/charts/services/portals-admin/values.staging.yaml index 7db3b0717c80..e993af124894 100644 --- a/charts/services/portals-admin/values.staging.yaml +++ b/charts/services/portals-admin/values.staging.yaml @@ -43,8 +43,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 8 replicas: - max: 30 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/portals-admin' ingress: @@ -63,9 +63,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 30 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/search-indexer-service/values.staging.yaml b/charts/services/search-indexer-service/values.staging.yaml index 39cebc125692..ba80482ce963 100644 --- a/charts/services/search-indexer-service/values.staging.yaml +++ b/charts/services/search-indexer-service/values.staging.yaml @@ -49,7 +49,7 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 1 + max: 3 min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-search-indexer' @@ -127,7 +127,7 @@ progressDeadlineSeconds: 1500 pvcs: [] replicaCount: default: 1 - max: 1 + max: 3 min: 1 resources: limits: diff --git a/charts/services/service-portal-api/values.staging.yaml b/charts/services/service-portal-api/values.staging.yaml index f766121d5b5b..07671994d3f9 100644 --- a/charts/services/service-portal-api/values.staging.yaml +++ b/charts/services/service-portal-api/values.staging.yaml @@ -67,8 +67,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 30 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-user-profile' ingress: @@ -110,9 +110,9 @@ podSecurityContext: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 30 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '800m' diff --git a/charts/services/service-portal/values.staging.yaml b/charts/services/service-portal/values.staging.yaml index 682ab594ddcd..65f13f82b35e 100644 --- a/charts/services/service-portal/values.staging.yaml +++ b/charts/services/service-portal/values.staging.yaml @@ -46,8 +46,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 30 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/service-portal' ingress: @@ -66,9 +66,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 30 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '300m' diff --git a/charts/services/services-auth-admin-api/values.staging.yaml b/charts/services/services-auth-admin-api/values.staging.yaml index b1c22013d7d8..1d972f8b160a 100644 --- a/charts/services/services-auth-admin-api/values.staging.yaml +++ b/charts/services/services-auth-admin-api/values.staging.yaml @@ -70,8 +70,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-auth-admin-api' ingress: @@ -89,9 +89,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/services-auth-delegation-api/values.staging.yaml b/charts/services/services-auth-delegation-api/values.staging.yaml index 6547bd4e464b..03180c9e830d 100644 --- a/charts/services/services-auth-delegation-api/values.staging.yaml +++ b/charts/services/services-auth-delegation-api/values.staging.yaml @@ -71,8 +71,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-auth-delegation-api' ingress: @@ -89,9 +89,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/services-auth-ids-api/values.staging.yaml b/charts/services/services-auth-ids-api/values.staging.yaml index 1e1e45950161..054896398d70 100644 --- a/charts/services/services-auth-ids-api/values.staging.yaml +++ b/charts/services/services-auth-ids-api/values.staging.yaml @@ -81,8 +81,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 15 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-auth-ids-api' initContainer: @@ -127,9 +127,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 15 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '800m' diff --git a/charts/services/services-auth-personal-representative-public/values.staging.yaml b/charts/services/services-auth-personal-representative-public/values.staging.yaml index 5a132366628b..7f10d51b3fd0 100644 --- a/charts/services/services-auth-personal-representative-public/values.staging.yaml +++ b/charts/services/services-auth-personal-representative-public/values.staging.yaml @@ -44,8 +44,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-auth-personal-representative-public' ingress: @@ -62,9 +62,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/services-auth-personal-representative/values.staging.yaml b/charts/services/services-auth-personal-representative/values.staging.yaml index 16fadeb06ab7..f6d9afc4f121 100644 --- a/charts/services/services-auth-personal-representative/values.staging.yaml +++ b/charts/services/services-auth-personal-representative/values.staging.yaml @@ -65,8 +65,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-auth-personal-representative' ingress: @@ -83,9 +83,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/services-auth-public-api/values.staging.yaml b/charts/services/services-auth-public-api/values.staging.yaml index 31a9e6949e53..a2dbe2c7352a 100644 --- a/charts/services/services-auth-public-api/values.staging.yaml +++ b/charts/services/services-auth-public-api/values.staging.yaml @@ -77,8 +77,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-auth-public-api' ingress: @@ -99,9 +99,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/services-bff-portals-admin/values.staging.yaml b/charts/services/services-bff-portals-admin/values.staging.yaml index a8b5553f847b..b27a1436a50d 100644 --- a/charts/services/services-bff-portals-admin/values.staging.yaml +++ b/charts/services/services-bff-portals-admin/values.staging.yaml @@ -58,8 +58,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-bff' ingress: @@ -81,9 +81,9 @@ podSecurityContext: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/services-bff-portals-my-pages/values.staging.yaml b/charts/services/services-bff-portals-my-pages/values.staging.yaml index e4ce58391d55..ad1f25068192 100644 --- a/charts/services/services-bff-portals-my-pages/values.staging.yaml +++ b/charts/services/services-bff-portals-my-pages/values.staging.yaml @@ -57,8 +57,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-bff' ingress: @@ -80,9 +80,9 @@ podSecurityContext: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/services-sessions/values.staging.yaml b/charts/services/services-sessions/values.staging.yaml index adc3e526bdc1..fdf795c80439 100644 --- a/charts/services/services-sessions/values.staging.yaml +++ b/charts/services/services-sessions/values.staging.yaml @@ -50,7 +50,7 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 + max: 3 min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-sessions' @@ -69,7 +69,7 @@ podDisruptionBudget: pvcs: [] replicaCount: default: 1 - max: 10 + max: 3 min: 1 resources: limits: diff --git a/charts/services/services-university-gateway/values.staging.yaml b/charts/services/services-university-gateway/values.staging.yaml index 975b21ae2937..313eda0fc537 100644 --- a/charts/services/services-university-gateway/values.staging.yaml +++ b/charts/services/services-university-gateway/values.staging.yaml @@ -66,8 +66,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-university-gateway' ingress: @@ -122,9 +122,9 @@ podSecurityContext: fsGroup: 65534 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '200m' diff --git a/charts/services/skilavottord-web/values.staging.yaml b/charts/services/skilavottord-web/values.staging.yaml index 592971c93b7c..59d876710b15 100644 --- a/charts/services/skilavottord-web/values.staging.yaml +++ b/charts/services/skilavottord-web/values.staging.yaml @@ -42,8 +42,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 8 replicas: - max: 10 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/skilavottord-web' ingress: @@ -62,9 +62,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 10 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '400m' diff --git a/charts/services/user-notification-worker/values.staging.yaml b/charts/services/user-notification-worker/values.staging.yaml index ce46946924d2..5f2f70af09e6 100644 --- a/charts/services/user-notification-worker/values.staging.yaml +++ b/charts/services/user-notification-worker/values.staging.yaml @@ -78,7 +78,7 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 2 + max: 3 min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/services-user-notification' @@ -113,7 +113,7 @@ podSecurityContext: pvcs: [] replicaCount: default: 1 - max: 2 + max: 3 min: 1 resources: limits: diff --git a/charts/services/web/values.staging.yaml b/charts/services/web/values.staging.yaml index 8e672b5827be..1c68d6367609 100644 --- a/charts/services/web/values.staging.yaml +++ b/charts/services/web/values.staging.yaml @@ -52,8 +52,8 @@ hpa: cpuAverageUtilization: 90 nginxRequestsIrate: 5 replicas: - max: 50 - min: 2 + max: 3 + min: 1 image: repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/web' ingress: @@ -72,9 +72,9 @@ podDisruptionBudget: maxUnavailable: 1 pvcs: [] replicaCount: - default: 2 - max: 50 - min: 2 + default: 1 + max: 3 + min: 1 resources: limits: cpu: '1000m' diff --git a/infra/src/dsl/basic.spec.ts b/infra/src/dsl/basic.spec.ts index f3d24bb8d736..81a3e44397b7 100644 --- a/infra/src/dsl/basic.spec.ts +++ b/infra/src/dsl/basic.spec.ts @@ -9,7 +9,7 @@ const Staging: EnvironmentConfig = { auroraHost: 'a', redisHost: 'b', domain: 'staging01.devland.is', - type: 'staging', + type: 'prod', featuresOn: [], defaultMaxReplicas: 3, defaultMinReplicas: 2, diff --git a/infra/src/dsl/hpa.spec.ts b/infra/src/dsl/hpa.spec.ts index 6182c6fef66f..509c36fa5a57 100644 --- a/infra/src/dsl/hpa.spec.ts +++ b/infra/src/dsl/hpa.spec.ts @@ -9,7 +9,7 @@ const Staging: EnvironmentConfig = { auroraHost: 'a', redisHost: 'b', domain: 'staging01.devland.is', - type: 'staging', + type: 'prod', featuresOn: [], defaultMaxReplicas: 3, defaultMinReplicas: 2, diff --git a/infra/src/dsl/output-generators/map-to-helm-values.ts b/infra/src/dsl/output-generators/map-to-helm-values.ts index fdd6297613ba..e18e6ab23e21 100644 --- a/infra/src/dsl/output-generators/map-to-helm-values.ts +++ b/infra/src/dsl/output-generators/map-to-helm-values.ts @@ -109,17 +109,25 @@ const serializeService: SerializeMethod = async ( result.resources = serviceDef.resources // replicas - if (serviceDef.replicaCount) { + if (env1.type == 'staging') { result.replicaCount = { - min: serviceDef.replicaCount.min, - max: serviceDef.replicaCount.max, - default: serviceDef.replicaCount.default, + min: 1, + max: 3, + default: 1, } } else { - result.replicaCount = { - min: env1.defaultMinReplicas, - max: env1.defaultMaxReplicas, - default: env1.defaultMinReplicas, + if (serviceDef.replicaCount) { + result.replicaCount = { + min: serviceDef.replicaCount.min, + max: serviceDef.replicaCount.max, + default: serviceDef.replicaCount.default, + } + } else { + result.replicaCount = { + min: env1.defaultMinReplicas, + max: env1.defaultMaxReplicas, + default: env1.defaultMinReplicas, + } } }