Make all resource requests/limits powers of 2 for consistancy

sillsdev · Oct 28, 2024 · aaa7913 · aaa7913
1 parent bda3403
commit aaa7913
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 25 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
@@ -61,9 +61,9 @@ spec:
                   name: {{ .Values.awsEcr.configName }}
             resources:
               limits:
-                memory: 500Mi
+                memory: 256Mi
               requests:
-                memory: 500Mi
+                memory: 512Mi
             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
@@ -61,9 +61,9 @@ spec:
               name: "{{ .Values.awsEcr.configName }}"
         resources:
           limits:
-            memory: 500Mi
+            memory: 256Mi
           requests:
-            memory: 500Mi
+            memory: 512Mi
         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
@@ -75,9 +75,9 @@ spec:
                       name: {{ .Values.envName | quote }}
               resources:
                 limits:
-                  memory: 500Mi
+                  memory: 256Mi
                 requests:
-                  memory: 500Mi
+                  memory: 512Mi
               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
@@ -74,9 +74,9 @@ spec:
               name: {{ .Values.envName  | quote }}
         resources:
           limits:
-            memory: 500Mi
+            memory: 256Mi
           requests:
-            memory: 500Mi
+            memory: 512Mi
         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
@@ -66,9 +66,9 @@ spec:
           resources:
             requests:
               cpu:  2m
-              memory: 100M
+              memory: 128Mi
             limits:
-              memory: 150M
+              memory: 256Mi
       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
@@ -51,9 +51,9 @@ spec:
           resources:
             requests:
               cpu:  1m
-              memory: 10M
+              memory: 16Mi
             limits:
-              memory: 50M
+              memory: 64Mi
           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
@@ -52,9 +52,9 @@ spec:
           name: create-admin-user
           resources:
             limits:
-              memory: 500Mi
+              memory: 256Mi
             requests:
-              memory: 500Mi
+              memory: 512Mi
           volumeMounts:
             - mountPath: /home/app/.CombineFiles
               name: backend-data

diff --git a/deploy/helm/thecombine/charts/backend/templates/deployment-backend.yaml b/deploy/helm/thecombine/charts/backend/templates/deployment-backend.yaml
@@ -100,7 +100,7 @@ spec:
           resources:
             requests:
               cpu: 5m
-              memory: 960Mi
+              memory: 1Gi
 {{- if .Values.global.includeResourceLimits }}
             limits:
               memory: 4Gi

diff --git a/deploy/helm/thecombine/charts/database/templates/database.yaml b/deploy/helm/thecombine/charts/database/templates/database.yaml
@@ -51,7 +51,7 @@ spec:
           resources:
             requests:
               cpu:  25m
-              memory: 950Mi
+              memory: 1Gi
 {{- if .Values.global.includeResourceLimits }}
             limits:
               memory: 2Gi

diff --git a/deploy/helm/thecombine/charts/frontend/templates/deployment-frontend.yaml b/deploy/helm/thecombine/charts/frontend/templates/deployment-frontend.yaml
@@ -77,10 +77,10 @@ spec:
           resources:
             requests:
               cpu:  1m
-              memory: 15M
+              memory: 16Mi
 {{- if .Values.global.includeResourceLimits }}
             limits:
-              memory: 40M
+              memory: 64Mi
 {{- 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
@@ -33,9 +33,9 @@ spec:
             resources:
               requests:
                 cpu:  200m
-                memory: 150M
+                memory: 256Mi
               limits:
-                memory: 150M
+                memory: 512Mi
             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
@@ -32,9 +32,9 @@ spec:
               - get-fonts.sh
             resources:
               limits:
-                memory: 500Mi
+                memory: 256Mi
               requests:
-                memory: 500Mi
+                memory: 512Mi
             securityContext:
               capabilities: {}
             terminationMessagePath: /dev/termination-log

diff --git a/deploy/helm/thecombine/charts/maintenance/templates/deployment-maintenance.yaml b/deploy/helm/thecombine/charts/maintenance/templates/deployment-maintenance.yaml
@@ -106,7 +106,7 @@ spec:
           resources:
             requests:
               cpu:  200m
-              memory: 1200Mi
+              memory: 2Gi
 {{- if .Values.global.includeResourceLimits }}
             limits:
               memory: 4Gi

diff --git a/deploy/helm/thecombine/charts/maintenance/templates/get-fonts-hook.yaml b/deploy/helm/thecombine/charts/maintenance/templates/get-fonts-hook.yaml
@@ -47,9 +47,9 @@ spec:
 {{- end }}
         resources:
           limits:
-            memory: 500Mi
+            memory: 256Mi
           requests:
-            memory: 500Mi
+            memory: 512Mi
         securityContext:
           capabilities: {}
         terminationMessagePath: /dev/termination-log