Match requests to limits on all our little jobs

sillsdev · Oct 30, 2024 · ee8c47a · ee8c47a
1 parent b57e7b5
commit ee8c47a
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/deploy/helm/aws-login/templates/aws-ecr-login-cronjob.yaml b/deploy/helm/aws-login/templates/aws-ecr-login-cronjob.yaml
@@ -63,7 +63,7 @@ spec:
               requests:
                 memory: 128Mi
               limits:
-                memory: 256Mi
+                memory: 128Mi
             securityContext:
               capabilities: {}
             terminationMessagePath: /dev/termination-log

diff --git a/deploy/helm/aws-login/templates/aws-ecr-login-oneshot.yaml b/deploy/helm/aws-login/templates/aws-ecr-login-oneshot.yaml
@@ -63,7 +63,7 @@ spec:
           requests:
             memory: 128Mi
           limits:
-            memory: 256Mi
+            memory: 128Mi
         securityContext:
           capabilities: {}
         terminationMessagePath: /dev/termination-log

diff --git a/deploy/helm/cert-proxy-client/templates/update-cert-cronjob.yaml b/deploy/helm/cert-proxy-client/templates/update-cert-cronjob.yaml
@@ -77,7 +77,7 @@ spec:
                 requests:
                   memory: 128Mi
                 limits:
-                  memory: 256Mi
+                  memory: 128Mi
               securityContext:
                 capabilities: {}
               terminationMessagePath: /dev/termination-log

diff --git a/deploy/helm/cert-proxy-client/templates/update-cert-oneshot.yaml b/deploy/helm/cert-proxy-client/templates/update-cert-oneshot.yaml
@@ -76,7 +76,7 @@ spec:
           requests:
             memory: 128Mi
           limits:
-            memory: 256Mi
+            memory: 128Mi
         securityContext:
           capabilities: {}
         terminationMessagePath: /dev/termination-log

diff --git a/deploy/helm/cert-proxy-server/templates/deployment-cert-proxy-server.yaml b/deploy/helm/cert-proxy-server/templates/deployment-cert-proxy-server.yaml
@@ -68,7 +68,7 @@ spec:
               cpu:  2m
               memory: 128Mi
             limits:
-              memory: 256Mi
+              memory: 128Mi
       restartPolicy: Always
 {{- if ne .Values.global.pullSecretName "None" }}
       imagePullSecrets:

diff --git a/deploy/helm/cert-proxy-server/templates/deployment-nuc-proxy.yaml b/deploy/helm/cert-proxy-server/templates/deployment-nuc-proxy.yaml
@@ -53,7 +53,7 @@ spec:
               cpu:  1m
               memory: 128Mi
             limits:
-              memory: 256Mi
+              memory: 128Mi
           volumeMounts:
             - name: nginx-html
               mountPath: /usr/share/nginx/html

diff --git a/deploy/helm/create-admin-user/templates/job-create-admin-user.yaml b/deploy/helm/create-admin-user/templates/job-create-admin-user.yaml
@@ -54,7 +54,7 @@ spec:
             requests:
               memory: 128Mi
             limits:
-              memory: 256Mi
+              memory: 128Mi
           volumeMounts:
             - mountPath: /home/app/.CombineFiles
               name: backend-data

diff --git a/deploy/helm/thecombine/charts/frontend/templates/deployment-frontend.yaml b/deploy/helm/thecombine/charts/frontend/templates/deployment-frontend.yaml
@@ -80,7 +80,7 @@ spec:
               memory: 128Mi
 {{- if .Values.global.includeResourceLimits }}
             limits:
-              memory: 256Mi
+              memory: 128Mi
 {{- end }}
           volumeMounts:
             - mountPath: /usr/share/nginx/fonts

diff --git a/deploy/helm/thecombine/charts/maintenance/templates/cronjob-daily-backup.yaml b/deploy/helm/thecombine/charts/maintenance/templates/cronjob-daily-backup.yaml
@@ -35,7 +35,7 @@ spec:
                 cpu:  200m
                 memory: 128Mi
               limits:
-                memory: 256Mi
+                memory: 128Mi
             securityContext:
               capabilities: {}
             terminationMessagePath: /dev/termination-log

diff --git a/deploy/helm/thecombine/charts/maintenance/templates/cronjob-update-fonts.yaml b/deploy/helm/thecombine/charts/maintenance/templates/cronjob-update-fonts.yaml
@@ -34,7 +34,7 @@ spec:
               requests:
                 memory: 128Mi
               limits:
-                memory: 256Mi
+                memory: 128Mi
             securityContext:
               capabilities: {}
             terminationMessagePath: /dev/termination-log

diff --git a/deploy/helm/thecombine/charts/maintenance/templates/get-fonts-hook.yaml b/deploy/helm/thecombine/charts/maintenance/templates/get-fonts-hook.yaml
@@ -49,7 +49,7 @@ spec:
           requests:
             memory: 128Mi
           limits:
-            memory: 256Mi
+            memory: 128Mi
         securityContext:
           capabilities: {}
         terminationMessagePath: /dev/termination-log

diff --git a/deploy/scripts/setup_files/collector_config.yaml b/deploy/scripts/setup_files/collector_config.yaml
@@ -56,6 +56,6 @@ useGOMEMLIMIT: true
 resources:
   requests:
     cpu: 25m
-    memory: 256Mi
+    memory: 512Mi
   limits:
     memory: 512Mi