From fe576e55a6571c849881915b1f1d1731e857aa4f Mon Sep 17 00:00:00 2001
From: Simon KP <“simon@techops.services”>
Date: Wed, 18 Dec 2024 10:44:26 +1100
Subject: [PATCH] resolve conflicts

---
 helm/prod/backend.yaml     | 8 ++++----
 helm/prod/frontend.yaml    | 8 ++++----
 helm/staging/backend.yaml  | 8 ++++----
 helm/staging/frontend.yaml | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/helm/prod/backend.yaml b/helm/prod/backend.yaml
index 1d91ba65..25ab6ec0 100644
--- a/helm/prod/backend.yaml
+++ b/helm/prod/backend.yaml
@@ -35,11 +35,11 @@ podAnnotations:
 
 resources:
   limits:
-    cpu: 1
-    memory: 1Gi
+    cpu: 0
+    memory: 2Gi
   requests:
-    cpu: 250m
-    memory: 256Mi
+    cpu: 35m
+    memory: 500Mi
 
 env:
   NODE_ENV:
diff --git a/helm/prod/frontend.yaml b/helm/prod/frontend.yaml
index 533d8335..166279f1 100644
--- a/helm/prod/frontend.yaml
+++ b/helm/prod/frontend.yaml
@@ -35,11 +35,11 @@ podAnnotations:
 
 resources:
   limits:
-    cpu: 1
-    memory: 1Gi
+    cpu: 0
+    memory: 2Gi
   requests:
-    cpu: 250m
-    memory: 256Mi
+    cpu: 20m
+    memory: 60Mi
 
 env:
   NODE_ENV:
diff --git a/helm/staging/backend.yaml b/helm/staging/backend.yaml
index e187e7d2..2dd6bf0f 100644
--- a/helm/staging/backend.yaml
+++ b/helm/staging/backend.yaml
@@ -36,11 +36,11 @@ podAnnotations:
 
 resources:
   limits:
-    cpu: 1
-    memory: 1Gi
+    cpu: 0
+    memory: 2Gi
   requests:
-    cpu: 250m
-    memory: 256Mi
+    cpu: 35m
+    memory: 500Mi
 
 env:
   NODE_ENV:
diff --git a/helm/staging/frontend.yaml b/helm/staging/frontend.yaml
index c23b77ae..a074a486 100644
--- a/helm/staging/frontend.yaml
+++ b/helm/staging/frontend.yaml
@@ -36,11 +36,11 @@ podAnnotations:
 
 resources:
   limits:
-    cpu: 0.1
-    memory: 64Mi
+    cpu: 0
+    memory: 2Gi
   requests:
-    cpu: 0.05
-    memory: 32Mi
+    cpu: 20m
+    memory: 60Mi
 
 env:
   NODE_ENV: