From 3d3227ad245e70ff607ccaab696186c052f2063d Mon Sep 17 00:00:00 2001
From: Conor Brady <con.brad@gmail.com>
Date: Tue, 5 Nov 2024 15:37:30 -0800
Subject: [PATCH 1/2] Drop high CPU limits (#4060)

---
 openshift/templates/c_haines.cronjob.yaml       | 4 ++--
 openshift/templates/prune_hourlies_cronjob.yaml | 4 ++--
 openshift/templates/viirs_snow.cronjob.yaml     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openshift/templates/c_haines.cronjob.yaml b/openshift/templates/c_haines.cronjob.yaml
index 3a2743f4e..d7cd4f3b8 100644
--- a/openshift/templates/c_haines.cronjob.yaml
+++ b/openshift/templates/c_haines.cronjob.yaml
@@ -63,10 +63,10 @@ objects:
                 - name: ${JOB_NAME}
                   resources:
                     limits:
-                      cpu: "0.5"
+                      cpu: "250m"
                       memory: 2Gi
                     requests:
-                      cpu: "0.5"
+                      cpu: "75m"
                       memory: 1Gi
                   image: ${IMAGE_REGISTRY}/${PROJ_TOOLS}/${IMAGE_NAME}:${IMAGE_TAG}
                   imagePullPolicy: "Always"
diff --git a/openshift/templates/prune_hourlies_cronjob.yaml b/openshift/templates/prune_hourlies_cronjob.yaml
index 18f8e34e9..cee089ac3 100644
--- a/openshift/templates/prune_hourlies_cronjob.yaml
+++ b/openshift/templates/prune_hourlies_cronjob.yaml
@@ -79,9 +79,9 @@ objects:
                       value: ${SUFFIX}
                   resources:
                     limits:
-                      cpu: "1"
+                      cpu: "250m"
                       memory: 1024Mi
                     requests:
-                      cpu: "500m"
+                      cpu: "75m"
                       memory: 512Mi
               restartPolicy: OnFailure
diff --git a/openshift/templates/viirs_snow.cronjob.yaml b/openshift/templates/viirs_snow.cronjob.yaml
index fea5fbec8..b77a50ca7 100644
--- a/openshift/templates/viirs_snow.cronjob.yaml
+++ b/openshift/templates/viirs_snow.cronjob.yaml
@@ -144,9 +144,9 @@ objects:
                           key: object-store-bucket
                   resources:
                     limits:
-                      cpu: "2"
+                      cpu: "250m"
                       memory: 2048Mi
                     requests:
-                      cpu: "500m"
+                      cpu: "75m"
                       memory: 512Mi
               restartPolicy: OnFailure

From e9af933f59a5067acbcf5254e54643b7c5a0574c Mon Sep 17 00:00:00 2001
From: Conor Brady <con.brad@gmail.com>
Date: Tue, 5 Nov 2024 16:35:11 -0800
Subject: [PATCH 2/2] Revert NATs resource allocation changes (#4061)

---
 openshift/templates/nats.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openshift/templates/nats.yaml b/openshift/templates/nats.yaml
index 8af669001..14a898dfa 100644
--- a/openshift/templates/nats.yaml
+++ b/openshift/templates/nats.yaml
@@ -41,7 +41,7 @@ parameters:
     value: 3800Mi
   - name: MEMORY_LIMIT
     required: true
-    value: 6000Mi
+    value: 5000Mi
 
 objects:
   - apiVersion: v1
@@ -283,7 +283,7 @@ objects:
                   cpu: "250m"
                   memory: ${MEMORY_REQUEST}
                 limits:
-                  cpu: "3000m"
+                  cpu: "500m"
                   memory: ${MEMORY_LIMIT}
               command:
                 [