chore: all resources in values

Signed-off-by: ThibaultFy <thibault.fouqueray@gmail.com>
Substra · Apr 25, 2024 · 0708d41 · 0708d41
1 parent e537054
commit 0708d41
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 28 deletions.
diff --git a/charts/substra-backend/CHANGELOG.md b/charts/substra-backend/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 <!-- towncrier release notes start -->
 
+## [26.3.0] - 2024-04-19
+
+### Removed
+
+- Revert resources limits and requests (CPU and memory) for all containers.
+
+## [26.2.0] - 2024-04-18
+
+### Added
+
+- User docker registry in configurable through value in `containerRegistry.userImageRepository`
 
 ## [26.1.0] - 2024-04-17
 

diff --git a/charts/substra-backend/Chart.yaml b/charts/substra-backend/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: substra-backend
 home: https://github.com/Substra
-version: 26.1.0
+version: 26.3.0
 appVersion: 0.45.0
 kubeVersion: ">= 1.19.0-0"
 description: Main package for Substra

diff --git a/charts/substra-backend/README.md b/charts/substra-backend/README.md
@@ -302,6 +302,20 @@ See [UPGRADE.md](https://github.com/Substra/substra-backend/blob/main/charts/sub
 | `addAccountOperator.incomingOrganizations` | Incoming organizations credentials for substra backend organization-to-organization communications | `[]`  |
 | `addAccountOperator.users`                 | A list of administrators users who can log into the substra backend server with admin privileges   | `[]`  |
 
+### Registry prepopulate
+
+| Name                                                         | Description                            | Value   |
+| ------------------------------------------------------------ | -------------------------------------- | ------- |
+| `registryPrepopulate.waitRegistry.resources.requests.cpu`    | Wait registry container cpu request    | `500m`  |
+| `registryPrepopulate.waitRegistry.resources.requests.memory` | Wait registry container memory request | `200Mi` |
+| `registryPrepopulate.waitRegistry.resources.limits.memory`   | Wait registry container memory limit   | `400Mi` |
+| `registryPrepopulate.kaniko.resources.requests.cpu`          | Kaniko container cpu request           | `1000m` |
+| `registryPrepopulate.kaniko.resources.requests.memory`       | Kaniko container memory request        | `2Gi`   |
+| `registryPrepopulate.kaniko.resources.limits.memory`         | Kaniko container memory limit          | `8Gi`   |
+| `registryPrepopulate.pause.resources.requests.cpu`           | Pause container cpu request            | `50m`   |
+| `registryPrepopulate.pause.resources.requests.memory`        | Pause container memory request         | `64Mi`  |
+| `registryPrepopulate.pause.resources.limits.memory`          | Pause container memory limit           | `128Mi` |
+
 ### Single Sign-On through OpenID Connect
 
 Uses the authorization code flow.

diff --git a/charts/substra-backend/templates/deployment-api-events.yaml b/charts/substra-backend/templates/deployment-api-events.yaml
@@ -42,12 +42,7 @@ spec:
           image: {{ include "substra-backend.images.name" (dict "img" .Values.api.events.image "defaultTag" $.Chart.AppVersion) }}
           imagePullPolicy: {{ .Values.api.events.image.pullPolicy }}
           resources:
-            requests:
-              memory: "200Mi"
-              cpu: "500m"
-            limits:
-              memory: "400Mi"
-              cpu: "500m"
+            {{- toYaml .Values.api.events.resources | nindent 12 }}
           command: ["/bin/bash"]
           {{- if eq .Values.settings "prod" }}
           args: ["-c", "python manage.py consume"]

diff --git a/charts/substra-backend/templates/deployment-registry-prepopulate.yaml b/charts/substra-backend/templates/deployment-registry-prepopulate.yaml
@@ -24,20 +24,12 @@ spec:
       - name: wait-registry
         image: jwilder/dockerize:0.6.1
         resources:
-          requests:
-            memory: "200Mi"
-            cpu: "500m"
-          limits:
-            memory: "400Mi"
+          {{- toYaml .Values.registryPrepopulate.waitRegistry | nindent 12 }}
         command: ['dockerize', '-wait', 'tcp://{{ $.Release.Name }}-docker-registry:5000']
       - name: kaniko
         image: {{ include "common.images.name" $.Values.kaniko.image }}
         resources:
-          requests:
-            memory: "2Gi"
-            cpu: "1000m"
-          limits:
-            memory: "8Gi"
+          {{- toYaml .Values.registryPrepopulate.kaniko.resources | nindent 12 }}
         args:
           - "--context=/docker-context"
           {{- if .dstImage }}
@@ -61,11 +53,7 @@ spec:
       - image: gcr.io/google-containers/pause:3.2
         name: pause
         resources:
-          requests:
-            memory: "64Mi"
-            cpu: "50m"
-          limits:
-            memory: "128Mi"
+          {{- toYaml .Values.registryPrepopulate.pause.resources | nindent 12 }}
       volumes:
       - name: kaniko-dir
         emptyDir: {}

diff --git a/charts/substra-backend/templates/deployment-worker-events.yaml b/charts/substra-backend/templates/deployment-worker-events.yaml
@@ -42,12 +42,7 @@ spec:
           image: {{ include "substra-backend.images.name" (dict "img" .Values.worker.events.image "defaultTag" $.Chart.AppVersion) }}
           imagePullPolicy: {{ .Values.worker.events.image.pullPolicy }}
           resources:
-            requests:
-              memory: "200Mi"
-              cpu: "500m"
-            limits:
-              memory: "400Mi"
-              cpu: "500m"
+            {{- toYaml .Values.worker.events.resources | nindent 12 }}
           command: ["/bin/bash"]
           {{- if eq .Values.settings "prod" }}
           args: ["-c", "python manage.py consume"]

diff --git a/charts/substra-backend/values.yaml b/charts/substra-backend/values.yaml
@@ -371,6 +371,18 @@ worker:
       tag: null
       pullPolicy: IfNotPresent
       pullSecrets: []
+    ## @param worker.events.resources.requests.cpu Worker events container cpu request
+    ## @param worker.events.resources.requests.memory Worker events container memory request
+    ## @param worker.events.resources.limits.cpu Worker events container cpu limit
+    ## @param worker.events.resources.limits.memory Worker events container memory limit
+    ##
+    resources:
+      requests:
+        memory: "200Mi"
+        cpu: "500m"
+      limits:
+        memory: "400Mi"
+        cpu: "500m"
     ## @param worker.events.podSecurityContext.enabled Enable security context
     ## @param worker.events.podSecurityContext.runAsUser User ID for the pod
     ## @param worker.events.podSecurityContext.runAsGroup Group ID for the pod
@@ -678,6 +690,18 @@ api:
       ## If not set and create is true, a name is generated using the substra.fullname template
       ##
       name: ""
+      ## @param api.events.resources.requests.cpu Api events container cpu request
+      ## @param api.events.resources.requests.memory Api events container memory request
+      ## @param api.events.resources.limits.cpu Api events container cpu limit
+      ## @param api.events.resources.limits.memory Api events container memory limit
+      ##
+      resources:
+        requests:
+          memory: "200Mi"
+          cpu: "500m"
+        limits:
+          memory: "400Mi"
+          cpu: "500m"
 
 ## @section Orchestrator settings
 ##
@@ -776,6 +800,43 @@ addAccountOperator:
   ##
   users: []
 
+## @section Registry prepopulate
+##
+registryPrepopulate:
+  ## @param registryPrepopulate.waitRegistry.resources.requests.cpu Wait registry container cpu request
+  ## @param registryPrepopulate.waitRegistry.resources.requests.memory Wait registry container memory request
+  ## @param registryPrepopulate.waitRegistry.resources.limits.memory Wait registry container memory limit
+  ##
+  waitRegistry:
+    resources:
+      requests:
+        memory: "200Mi"
+        cpu: "500m"
+      limits:
+        memory: "400Mi"
+  ## @param registryPrepopulate.kaniko.resources.requests.cpu Kaniko container cpu request
+  ## @param registryPrepopulate.kaniko.resources.requests.memory Kaniko container memory request
+  ## @param registryPrepopulate.kaniko.resources.limits.memory Kaniko container memory limit
+  ##
+  kaniko:
+    resources:
+      requests:
+        memory: "2Gi"
+        cpu: "1000m"
+      limits:
+        memory: "8Gi"
+  ## @param registryPrepopulate.pause.resources.requests.cpu Pause container cpu request
+  ## @param registryPrepopulate.pause.resources.requests.memory Pause container memory request
+  ## @param registryPrepopulate.pause.resources.limits.memory Pause container memory limit
+  ##
+  pause:
+    resources:
+      requests:
+        memory: "64Mi"
+        cpu: "50m"
+      limits:
+        memory: "128Mi"
+
 ## @section Single Sign-On through OpenID Connect
 
 ## @descriptionStart Uses the authorization code flow.