From 9d95b77e6fa6727adffecf88f928461a9d1d7be4 Mon Sep 17 00:00:00 2001
From: Ingleiv Johansen <ingleivj@gmail.com>
Date: Wed, 6 Dec 2023 10:11:41 +0100
Subject: [PATCH] Reduser infra-ressurser (#132)

* Reduser ressurser for ey-slackbot

* Reduser cpu for ey-pdfgen

* Reduser cpu for notifikasjoner

* Reduser cpu for proxy
---
 apps/etterlatte-notifikasjoner/.nais/dev.yaml  | 6 ++++++
 apps/etterlatte-notifikasjoner/.nais/prod.yaml | 6 ++++++
 apps/etterlatte-proxy/.nais/dev.yaml           | 3 +--
 apps/etterlatte-proxy/.nais/prod.yaml          | 3 +--
 apps/ey-pdfgen/.nais/dev.yaml                  | 6 ++++++
 apps/ey-pdfgen/.nais/prod.yaml                 | 6 ++++++
 apps/ey-slackbot/.nais/dev.yaml                | 5 ++---
 7 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/apps/etterlatte-notifikasjoner/.nais/dev.yaml b/apps/etterlatte-notifikasjoner/.nais/dev.yaml
index 4eeb0c0f2..4917266ad 100644
--- a/apps/etterlatte-notifikasjoner/.nais/dev.yaml
+++ b/apps/etterlatte-notifikasjoner/.nais/dev.yaml
@@ -26,6 +26,12 @@ spec:
     cpuThresholdPercentage: 90
     max: 1
     min: 1
+  resources:
+    limits:
+      memory: 512Mi
+    requests:
+      cpu: 20m
+      memory: 256Mi
   env:
     - name: KAFKA_RAPID_TOPIC
       value: etterlatte.dodsmelding
diff --git a/apps/etterlatte-notifikasjoner/.nais/prod.yaml b/apps/etterlatte-notifikasjoner/.nais/prod.yaml
index 94dd0f924..69dc1eca8 100644
--- a/apps/etterlatte-notifikasjoner/.nais/prod.yaml
+++ b/apps/etterlatte-notifikasjoner/.nais/prod.yaml
@@ -26,6 +26,12 @@ spec:
     cpuThresholdPercentage: 90
     max: 1
     min: 1
+  resources:
+    limits:
+      memory: 512Mi
+    requests:
+      cpu: 20m
+      memory: 256Mi
   env:
     - name: KAFKA_RAPID_TOPIC
       value: etterlatte.etterlatteytelser
diff --git a/apps/etterlatte-proxy/.nais/dev.yaml b/apps/etterlatte-proxy/.nais/dev.yaml
index 345a3c4d1..d7cd28551 100644
--- a/apps/etterlatte-proxy/.nais/dev.yaml
+++ b/apps/etterlatte-proxy/.nais/dev.yaml
@@ -24,10 +24,9 @@ spec:
     timeout: 1
   resources:
     limits:
-      cpu: 500m
       memory: 2Gi
     requests:
-      cpu: 100m
+      cpu: 50m
       memory: 512Mi
   ingresses:
     - "https://etterlatte-proxy.dev-fss-pub.nais.io"
diff --git a/apps/etterlatte-proxy/.nais/prod.yaml b/apps/etterlatte-proxy/.nais/prod.yaml
index 1bf650845..9714e88ad 100644
--- a/apps/etterlatte-proxy/.nais/prod.yaml
+++ b/apps/etterlatte-proxy/.nais/prod.yaml
@@ -24,10 +24,9 @@ spec:
     timeout: 1
   resources:
     limits:
-      cpu: 500m
       memory: 2Gi
     requests:
-      cpu: 100m
+      cpu: 50m
       memory: 512Mi
   ingresses:
     - "https://etterlatte-proxy.prod-fss-pub.nais.io"
diff --git a/apps/ey-pdfgen/.nais/dev.yaml b/apps/ey-pdfgen/.nais/dev.yaml
index 957cb19c9..e4d692d62 100644
--- a/apps/ey-pdfgen/.nais/dev.yaml
+++ b/apps/ey-pdfgen/.nais/dev.yaml
@@ -12,6 +12,12 @@ spec:
   replicas:
     min: 1
     max: 1
+  resources:
+    limits:
+      memory: 512Mi
+    requests:
+      cpu: 100m
+      memory: 256Mi
   liveness:
     path: /is_alive
   readiness:
diff --git a/apps/ey-pdfgen/.nais/prod.yaml b/apps/ey-pdfgen/.nais/prod.yaml
index 3a165c04c..cf66d104f 100644
--- a/apps/ey-pdfgen/.nais/prod.yaml
+++ b/apps/ey-pdfgen/.nais/prod.yaml
@@ -10,6 +10,12 @@ spec:
   replicas:
     min: 1
     max: 1
+  resources:
+    limits:
+      memory: 512Mi
+    requests:
+      cpu: 100m
+      memory: 256Mi
   liveness:
     path: /is_alive
   readiness:
diff --git a/apps/ey-slackbot/.nais/dev.yaml b/apps/ey-slackbot/.nais/dev.yaml
index 68e9badf8..bdea52281 100644
--- a/apps/ey-slackbot/.nais/dev.yaml
+++ b/apps/ey-slackbot/.nais/dev.yaml
@@ -19,11 +19,10 @@ spec:
     path: /internal/is_alive
   resources:
     limits:
-      cpu: 500m
       memory: 512Mi
     requests:
-      cpu: 100m
-      memory: 512Mi
+      cpu: 10m
+      memory: 128Mi
   ingresses:
     - https://ey-slackbot.ekstern.dev.nav.no
   accessPolicy: