From 4c9a325960239fab5c3d08835863b84b3f4f0b93 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Wed, 22 Jan 2025 20:34:55 -0800 Subject: [PATCH 1/2] Allow specifying resources separately for all components --- helm-chart/templates/deployment.yaml | 4 +++- helm-chart/values.yaml | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/helm-chart/templates/deployment.yaml b/helm-chart/templates/deployment.yaml index 3fd93e4..6c55a1d 100644 --- a/helm-chart/templates/deployment.yaml +++ b/helm-chart/templates/deployment.yaml @@ -94,7 +94,7 @@ spec: - frx_challenges.wsgi securityContext: runAsUser: 0 - resources: {{ toJson .Values.resources }} + resources: {{ toJson .Values.web.resources }} volumeMounts: - name: storage mountPath: /opt/state @@ -103,6 +103,7 @@ spec: subPath: frx_challenges.yaml - name: dind image: {{ .Values.dind.image.repository }}:{{ .Values.dind.image.tag }} + resources: {{ toJson .Values.dind.resources }} command: {{ if .Values.dind.rootless }} - dind @@ -121,6 +122,7 @@ spec: - name: evaluator image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} + resources: {{ toJson .Values.evaluator.resources }} args: - python - manage.py diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 3abce24..99be073 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -9,6 +9,9 @@ image: tag: "1.0.1" pullPolicy: IfNotPresent +web: + resources: {} + imagePullSecrets: [] nameOverride: "" fullnameOverride: "" @@ -36,7 +39,6 @@ pvc: storage: 1Gi storageClassName: -resources: {} nodeSelector: {} @@ -63,8 +65,12 @@ nginx: extraInitContainers: {} +evaluator: + resources: {} + dind: rootless: false + resources: {} image: repository: docker tag: 27.0.3-dind From f8578c2d1806228f06401b944c5033d60dbeb6eb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 04:38:05 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- helm-chart/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 99be073..a6700f5 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -39,7 +39,6 @@ pvc: storage: 1Gi storageClassName: - nodeSelector: {} tolerations: []