From ee8c47a56155cfe2cc96cfd831a83926527a9758 Mon Sep 17 00:00:00 2001 From: Danny Rorabaugh Date: Wed, 30 Oct 2024 08:28:05 -0400 Subject: [PATCH] Match requests to limits on all our little jobs --- deploy/helm/aws-login/templates/aws-ecr-login-cronjob.yaml | 2 +- deploy/helm/aws-login/templates/aws-ecr-login-oneshot.yaml | 2 +- .../helm/cert-proxy-client/templates/update-cert-cronjob.yaml | 2 +- .../helm/cert-proxy-client/templates/update-cert-oneshot.yaml | 2 +- .../templates/deployment-cert-proxy-server.yaml | 2 +- .../helm/cert-proxy-server/templates/deployment-nuc-proxy.yaml | 2 +- .../helm/create-admin-user/templates/job-create-admin-user.yaml | 2 +- .../charts/frontend/templates/deployment-frontend.yaml | 2 +- .../charts/maintenance/templates/cronjob-daily-backup.yaml | 2 +- .../charts/maintenance/templates/cronjob-update-fonts.yaml | 2 +- .../thecombine/charts/maintenance/templates/get-fonts-hook.yaml | 2 +- deploy/scripts/setup_files/collector_config.yaml | 2 +- 12 files changed, 12 insertions(+), 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 index 46689f60d..168958b69 100644 --- 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 index d2ad34fc9..8f7266da6 100644 --- 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 index 15bff1d07..97a51a3da 100644 --- 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 index a51d7223b..a6de7a6c3 100644 --- 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 index 3ee9ef733..c7ea2c55b 100644 --- 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 index a3ab6e8db..21be6f860 100644 --- 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 index 018dd6c2e..eaf79685f 100644 --- 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 index adbede6eb..36e025f39 100644 --- 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 index 3c9af720c..73b28a0eb 100644 --- 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 index bcbc6861a..4fa9da913 100644 --- 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 index 106d32fcd..0327191cf 100644 --- 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 index e9a6cc256..1954698ac 100644 --- 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