Revert "chore: Change scaling nginx rate of increase metric for IDS (#…

…14646)" This reverts commit e5b94e4.
island-is · Jun 18, 2024 · ef8994c · ef8994c
1 parent e5b94e4
commit ef8994c
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 42 deletions.
diff --git a/apps/auth-admin-web/infra/auth-admin-web.ts b/apps/auth-admin-web/infra/auth-admin-web.ts
@@ -53,7 +53,6 @@ export const serviceSetup = (): ServiceBuilder<'auth-admin-web'> => {
       },
     })
     .replicaCount({
-      scalingMagicNumber: 10,
       default: 2,
       min: 2,
       max: 10,

diff --git a/apps/services/auth/admin-api/infra/auth-admin-api.ts b/apps/services/auth/admin-api/infra/auth-admin-api.ts
@@ -65,7 +65,6 @@ export const serviceSetup = (): ServiceBuilder<'services-auth-admin-api'> => {
       },
     })
     .replicaCount({
-      scalingMagicNumber: 10,
       default: 2,
       min: 2,
       max: 10,

diff --git a/apps/services/auth/ids-api/infra/identity-server.ts b/apps/services/auth/ids-api/infra/identity-server.ts
@@ -157,12 +157,6 @@ export const serviceSetup = (services: {
     })
     .healthPort(5010)
     .targetPort(5000)
-    .replicaCount({
-      scalingMagicNumber: 10,
-      default: 2,
-      min: 2,
-      max: 10,
-    })
     .serviceAccount('identity-server')
     .readiness('/readiness')
     .liveness('/liveness')

diff --git a/apps/services/auth/personal-representative-public/infra/personal-representative-public.ts b/apps/services/auth/personal-representative-public/infra/personal-representative-public.ts
@@ -49,7 +49,6 @@ export const serviceSetup =
         },
       })
       .replicaCount({
-        scalingMagicNumber: 10,
         default: 2,
         min: 2,
         max: 10,

diff --git a/apps/services/auth/personal-representative/infra/personal-representative.ts b/apps/services/auth/personal-representative/infra/personal-representative.ts
@@ -84,7 +84,6 @@ export const serviceSetup =
         },
       })
       .replicaCount({
-        scalingMagicNumber: 10,
         default: 2,
         min: 2,
         max: 10,

diff --git a/apps/services/auth/public-api/infra/auth-public-api.ts b/apps/services/auth/public-api/infra/auth-public-api.ts
@@ -94,7 +94,6 @@ export const serviceSetup = (): ServiceBuilder<'services-auth-public-api'> => {
     .readiness('/health/check')
     .liveness('/liveness')
     .replicaCount({
-      scalingMagicNumber: 10,
       default: 2,
       min: 2,
       max: 10,

diff --git a/charts/identity-server/values.dev.yaml b/charts/identity-server/values.dev.yaml
@@ -32,7 +32,7 @@ auth-admin-web:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2
@@ -139,10 +139,10 @@ identity-server:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
-        max: 10
-        min: 2
+        max: 3
+        min: 1
   image:
     repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/identity-server'
   ingress:
@@ -170,9 +170,9 @@ identity-server:
       storageClass: 'efs-csi'
       useExisting: false
   replicaCount:
-    default: 2
-    max: 10
-    min: 2
+    default: 1
+    max: 3
+    min: 1
   resources:
     limits:
       cpu: '4000m'
@@ -240,7 +240,7 @@ services-auth-admin-api:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2
@@ -579,7 +579,7 @@ services-auth-personal-representative:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2
@@ -650,7 +650,7 @@ services-auth-personal-representative-public:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2
@@ -742,7 +742,7 @@ services-auth-public-api:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2

diff --git a/charts/identity-server/values.prod.yaml b/charts/identity-server/values.prod.yaml
@@ -32,7 +32,7 @@ auth-admin-web:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2
@@ -137,10 +137,10 @@ identity-server:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
-        min: 2
+        min: 3
   image:
     repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/identity-server'
   ingress:
@@ -167,9 +167,9 @@ identity-server:
       storageClass: 'efs-csi'
       useExisting: false
   replicaCount:
-    default: 2
+    default: 3
     max: 10
-    min: 2
+    min: 3
   resources:
     limits:
       cpu: '4000m'
@@ -237,7 +237,7 @@ services-auth-admin-api:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2
@@ -576,7 +576,7 @@ services-auth-personal-representative:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2
@@ -639,7 +639,7 @@ services-auth-personal-representative-public:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2
@@ -731,7 +731,7 @@ services-auth-public-api:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2

diff --git a/charts/identity-server/values.staging.yaml b/charts/identity-server/values.staging.yaml
@@ -32,7 +32,7 @@ auth-admin-web:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2
@@ -139,10 +139,10 @@ identity-server:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
-        max: 10
-        min: 2
+        max: 3
+        min: 1
   image:
     repository: '821090935708.dkr.ecr.eu-west-1.amazonaws.com/identity-server'
   ingress:
@@ -170,9 +170,9 @@ identity-server:
       storageClass: 'efs-csi'
       useExisting: false
   replicaCount:
-    default: 2
-    max: 10
-    min: 2
+    default: 1
+    max: 3
+    min: 1
   resources:
     limits:
       cpu: '4000m'
@@ -240,7 +240,7 @@ services-auth-admin-api:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2
@@ -579,7 +579,7 @@ services-auth-personal-representative:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2
@@ -642,7 +642,7 @@ services-auth-personal-representative-public:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2
@@ -734,7 +734,7 @@ services-auth-public-api:
     scaling:
       metric:
         cpuAverageUtilization: 90
-        nginxRequestsIrate: 10
+        nginxRequestsIrate: 5
       replicas:
         max: 10
         min: 2