From 033398936ae74c7b541a64b76cdcc7f58a3f0188 Mon Sep 17 00:00:00 2001
From: Linus Norton <linusnorton@gmail.com>
Date: Thu, 24 Oct 2024 18:29:18 +0300
Subject: [PATCH] lower cpu requests (#4085)

* lower cpu requests

* clean up preview request / limits that aren't applied

* clean up preview request / limits that aren't applied
---
 .../values.preview.template.yaml              | 16 ++++--------
 .../values.wa.preview.template.yaml           | 26 ++++++-------------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/charts/sscs-tribunals-api/values.preview.template.yaml b/charts/sscs-tribunals-api/values.preview.template.yaml
index 4bee4c6929e..c5deb34ba19 100644
--- a/charts/sscs-tribunals-api/values.preview.template.yaml
+++ b/charts/sscs-tribunals-api/values.preview.template.yaml
@@ -3,11 +3,7 @@ tags:
 
 java:
   image: ${IMAGE_NAME}
-  memoryLimits: "8Gi"
-  memoryRequests: "1Gi"
-  cpuRequests: "2"
   ingressHost: ${SERVICE_FQDN}
-  cpuLimits: 2000m
   readinessDelay: 45
   devmemoryRequests: 1Gi
   devmemoryLimits: 2Gi
@@ -130,10 +126,10 @@ ccd-case-document-am-api:
 xui-webapp:
   enabled: true
   nodejs:
-    devmemoryLimits: "1Gi"
-    devcpuLimits: 1
     devmemoryRequests: "512Mi"
-    devcpuRequests: "500m"
+    devmemoryLimits: "1Gi"
+    devcpuRequests: "200m"
+    devcpuLimits: "1000m"
     imagePullPolicy: Always
     releaseNameOverride: ${SERVICE_NAME}-xui-webapp
     image: hmctspublic.azurecr.io/xui/webapp:latest
@@ -443,7 +439,7 @@ ccd:
       disableKeyVaults: true
       devmemoryRequests: '1024Mi'
       devmemoryLimits: '2048Mi'
-      devcpuRequests: '900m'
+      devcpuRequests: '500m'
       autoscaling:
         enabled: false
         minReplicas: 1
@@ -472,7 +468,7 @@ ccd:
       imagePullPolicy: Always
       devmemoryRequests: '1524Mi'
       devmemoryLimits: '2048Mi'
-      devcpuRequests: '900m'
+      devcpuRequests: '500m'
       environment:
         DATA_STORE_DB_HOST: '{{ tpl .Values.global.postgresHostname $}}'
         DATA_STORE_DB_USERNAME: hmcts
@@ -537,8 +533,6 @@ elastic:
 sscs-tribunals-frontend:
   enabled: true
   nodejs:
-    memoryLimits: "2Gi"
-    cpuLimits: 2000m
     image: hmctspublic.azurecr.io/sscs/tribunals-frontend:latest
     ingressHost: sya-${SERVICE_FQDN}
     registerAdditionalDns:
diff --git a/charts/sscs-tribunals-api/values.wa.preview.template.yaml b/charts/sscs-tribunals-api/values.wa.preview.template.yaml
index 106dfbb1fd7..6e9048f8203 100644
--- a/charts/sscs-tribunals-api/values.wa.preview.template.yaml
+++ b/charts/sscs-tribunals-api/values.wa.preview.template.yaml
@@ -3,14 +3,10 @@ tags:
   sscs-ccd-idam-pr: true
 
 java:
-  memoryRequests: 2Gi
-  cpuRequests: 2000m
-  memoryLimits: 8Gi
-  cpuLimits: 3500m
-  devmemoryRequests: 6Gi
-  devcpuRequests: 2000m
-  devmemoryLimits: 8Gi
-  devcpuLimits: 4500m
+  devmemoryRequests: 1Gi
+  devmemoryLimits: 4Gi
+  devcpuRequests: 500m
+  devcpuLimits: 2000m
   image: ${IMAGE_NAME}
   readinessDelay: 45
   environment:
@@ -103,14 +99,10 @@ ccd-case-document-am-api:
 xui-webapp:
   enabled: true
   nodejs:
-    memoryRequests: 2Gi
-    cpuRequests: 2000m
-    memoryLimits: 4Gi
-    cpuLimits: 3500m
-    devmemoryRequests: 6Gi
-    devcpuRequests: 2000m
-    devmemoryLimits: 8Gi
-    devcpuLimits: 4500m
+    devmemoryRequests: "512Mi"
+    devmemoryLimits: "1Gi"
+    devcpuRequests: "200m"
+    devcpuLimits: "1000m"
     imagePullPolicy: Always
     releaseNameOverride: ${SERVICE_NAME}-xui-webapp
     image: hmctspublic.azurecr.io/xui/webapp:latest
@@ -706,8 +698,6 @@ sscs-evidence-share:
 sscs-tribunals-frontend:
   enabled: true
   nodejs:
-    memoryLimits: "2Gi"
-    cpuLimits: 2000m
     image: hmctspublic.azurecr.io/sscs/tribunals-frontend:latest
     ingressHost: sya-${SERVICE_FQDN}
     environment: