From 489e9fed017a30d4393f73270dc867c0a9346748 Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman@google.com>
Date: Thu, 12 Dec 2024 02:25:37 +0000
Subject: [PATCH] [CI] Adjust CPU and memory limits

After switching to n2-highcpu-32 machines, the CPU and memory
requests/limits were left at the same values. This led to pods not
being scheduled or failing due to running out of memory relative to
the requests.

This patch updates the values to reflect the actual machine shapes
that we are running on.
---
 premerge/linux_container_pod_template.yaml | 6 +++---
 premerge/linux_runners_values.yaml         | 4 ++--
 premerge/windows_runner_values.yaml        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/premerge/linux_container_pod_template.yaml b/premerge/linux_container_pod_template.yaml
index c7d1baf35..42914bf62 100644
--- a/premerge/linux_container_pod_template.yaml
+++ b/premerge/linux_container_pod_template.yaml
@@ -20,7 +20,7 @@ spec:
       # It's not used for scheduling, but can be used by k8 for OOM kill.
       requests:
         cpu: "100m"
-        memory: "50Gi"
+        memory: "25Gi"
       limits:
-        cpu: 56
-        memory: "100Gi"
+        cpu: 32
+        memory: "32Gi"
diff --git a/premerge/linux_runners_values.yaml b/premerge/linux_runners_values.yaml
index 407e81436..d9b91a158 100644
--- a/premerge/linux_runners_values.yaml
+++ b/premerge/linux_runners_values.yaml
@@ -47,10 +47,10 @@ template:
         # itself doesn't need much, just using something enough not to get
         # OOM killed.
         requests:
-          cpu: 50
+          cpu: 25
           memory: "2Gi"
         limits:
-          cpu: 56
+          cpu: 32
           memory: "2Gi"
       env:
         - name: ACTIONS_RUNNER_CONTAINER_HOOKS
diff --git a/premerge/windows_runner_values.yaml b/premerge/windows_runner_values.yaml
index 6d2977621..e676e3df1 100644
--- a/premerge/windows_runner_values.yaml
+++ b/premerge/windows_runner_values.yaml
@@ -21,7 +21,7 @@ template:
       - name: runner
         resources:
           requests:
-            cpu: 50
+            cpu: 25
         # TODO(boomanaiden154): Update this image when we have a proper windows
         # image ready.
         image: ghcr.io/keenuts-test-org/windows-ci-image:latest