chore: overwrite dev ressources in separate yaml (#907)

* chore: overwrite dev ressources in separate yaml Signed-off-by: ThibaultFy <[email protected]> * chore: chart Signed-off-by: ThibaultFy <[email protected]> * reset previous resources Signed-off-by: ThibaultFy <[email protected]> * reset previous resources Signed-off-by: ThibaultFy <[email protected]> * doc chart Signed-off-by: ThibaultFy <[email protected]> --------- Signed-off-by: ThibaultFy <[email protected]>
Substra · May 22, 2024 · ae20351 · ae20351
1 parent 677edd2
commit ae20351
Show file tree

Hide file tree

Showing 7 changed files with 160 additions and 55 deletions.
diff --git a/backend/substrapp/kubernetes_utils.py b/backend/substrapp/kubernetes_utils.py
@@ -55,9 +55,11 @@ def get_resources_requirements_from_yaml(
     """Return a kubernetes.client.V1ResourceRequirements object from a yaml string."""
     resources_dict = yaml.safe_load(yaml_resources)
 
-    return kubernetes.client.V1ResourceRequirements(
-        requests=resources_dict["requests"], limits=resources_dict["limits"]
-    )
+    requests = resources_dict.get("requests", None)
+
+    limits = resources_dict.get("limits", None)
+
+    return kubernetes.client.V1ResourceRequirements(requests=requests, limits=limits)
 
 
 def pod_exists_by_label_selector(k8s_client: kubernetes.client.CoreV1Api, label_selector: str) -> bool:

diff --git a/charts/substra-backend/CHANGELOG.md b/charts/substra-backend/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!-- towncrier release notes start -->
 
+## [26.5.1] - 2024-05-21
+
+### Changed
+
+- Add `resources-dev.yaml` file to overwrite resources requirement to a minimal value in a dev setup (#907)
+
 ## [26.5.0] - 2024-04-29
 
 ### Added

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.5.0
+version: 26.5.1
 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
diff --git a/charts/substra-backend/resources-dev.yaml b/charts/substra-backend/resources-dev.yaml
@@ -0,0 +1,94 @@
+server:
+  resources:
+    requests:
+      cpu: "10m"
+      memory: "16Mi"
+worker:
+  resources:
+    requests:
+      cpu: "10m"
+      memory: "16Mi"
+  computePod:
+    resources:
+      requests:
+        cpu: "10m"
+        memory: "16Mi"
+  events:
+    resources:
+      requests:
+        cpu: "10m"
+        memory: "16Mi"
+
+schedulerWorker:
+  resources:
+    requests:
+      cpu: "10m"
+      memory: "16Mi"
+
+scheduler:
+  resources:
+    requests:
+      cpu: "10m"
+      memory: "16Mi"
+
+builder:
+  resources:
+    requests:
+      cpu: "10m"
+      memory: "16Mi"
+
+api:
+  events:
+    resources:
+      requests:
+        cpu: "10m"
+        memory: "16Mi"
+
+kaniko:
+  resources:
+    requests:
+      cpu: "10m"
+      memory: "16Mi"
+
+registryPrepopulate:
+  waitRegistry:
+    resources:
+      requests:
+        cpu: "10m"
+        memory: "16Mi"
+  pause:
+    resources:
+      requests:
+        cpu: "10m"
+        memory: "16Mi"
+
+postgresql:
+  primary:
+    resources:
+      requests:
+        cpu: "10m"
+        memory: "16Mi"
+
+redis:
+  resources:
+    requests:
+      cpu: "10m"
+      memory: "16Mi"
+
+docker-registry:
+  resources:
+    requests:
+      cpu: "10m"
+      memory: "16Mi"
+
+minio:
+  resources:
+    requests:
+      cpu: "10m"
+      memory: "16Mi"
+
+localstack:
+  resources:
+    requests:
+      cpu: "10m"
+      memory: "16Mi"
diff --git a/charts/substra-backend/values.yaml b/charts/substra-backend/values.yaml
@@ -179,8 +179,8 @@ server:
   ##
   resources:
     requests:
-      cpu: "200m"
-      memory: "512Mi"
+      cpu: "1000m"
+      memory: "6Gi"
     limits:
       cpu: "2000m"
       memory: "12Gi"
@@ -313,8 +313,8 @@ worker:
   ##
   resources:
     requests:
-      cpu: "200m"
-      memory: "512Mi"
+      cpu: "1000m"
+      memory: "4Gi"
     limits:
       cpu: "2000m"
       memory: "8Gi"
@@ -361,8 +361,8 @@ worker:
     ##
     resources:
       requests:
-        cpu: "500m"
-        memory: "512Mi"
+        cpu: "1000m"
+        memory: "1Gi"
       limits:
         memory: "64Gi"
   events:
@@ -388,8 +388,8 @@ worker:
     ##
     resources:
       requests:
-        memory: "50Mi"
-        cpu: "100m"
+        memory: "200Mi"
+        cpu: "500m"
       limits:
         memory: "400Mi"
         cpu: "500m"
@@ -462,8 +462,8 @@ schedulerWorker:
   ##
   resources:
     requests:
-      cpu: "50m"
-      memory: "50Mi"
+      cpu: "250m"
+      memory: "200Mi"
     limits:
       cpu: "250m"
       memory: "400Mi"
@@ -505,8 +505,8 @@ scheduler:
   ##
   resources:
     requests:
-      cpu: "50m"
-      memory: "50Mi"
+      cpu: "250m"
+      memory: "200Mi"
     limits:
       cpu: "250m"
       memory: "400Mi"
@@ -582,8 +582,8 @@ builder:
   ##
   resources:
     requests:
-      cpu: "200m"
-      memory: "512Mi"
+      cpu: "2000m"
+      memory: "4Gi"
     limits:
       cpu: "2000m"
       memory: "8Gi"
@@ -675,8 +675,8 @@ api:
     ##
     resources:
       requests:
-        memory: "50Mi"
-        cpu: "100m"
+        memory: "200Mi"
+        cpu: "500m"
       limits:
         memory: "400Mi"
         cpu: "500m"
@@ -764,8 +764,8 @@ kaniko:
   ##
   resources:
     requests:
-      cpu: "500m"
-      memory: "256Mi"
+      cpu: "1000m"
+      memory: "4Gi"
     limits:
       memory: "32Gi"
   ## @param kaniko.mirror If set to `true` pull base images from the local registry.
@@ -829,8 +829,8 @@ registryPrepopulate:
   waitRegistry:
     resources:
       requests:
-        memory: "50Mi"
-        cpu: "100m"
+        memory: "200Mi"
+        cpu: "500m"
       limits:
         memory: "400Mi"
   ## @param registryPrepopulate.pause.resources.requests.cpu Pause container cpu request
@@ -947,8 +947,8 @@ postgresql:
         - ALL
     resources:
       requests:
-        cpu: "50m"
-        memory: "256Mi"
+        cpu: "1000m"
+        memory: "2Gi"
       limits:
         cpu: "1000m"
         memory: "4Gi"
@@ -968,8 +968,8 @@ redis:
         redis: 6379
     resources:
       requests:
-        cpu: "50m"
-        memory: "256Mi"
+        cpu: "500m"
+        memory: "512Mi"
       limits:
         cpu: "500m"
         memory: "1024Mi"
@@ -988,14 +988,14 @@ docker-registry:
   storage: filesystem
   persistence:
     enabled: true
-    size: 50Gi
+    size: 10Gi
     deleteEnabled: true
   service:
     type: NodePort
   resources:
     requests:
-      cpu: "100m"
-      memory: "256Mi"
+      cpu: "500m"
+      memory: "16Gi"
     limits:
       cpu: "500m"
       memory: "64Gi"
@@ -1021,8 +1021,8 @@ minio:
         - ALL
   resources:
     requests:
-      cpu: "100m"
-      memory: "1Gi"
+      cpu: "500m"
+      memory: "16Gi"
     limits:
       cpu: "1000m"
       memory: "64Gi"
@@ -1036,8 +1036,8 @@ localstack:
       nodePort: ""
   resources:
     requests:
-      cpu: "50m"
-      memory: "1Gi"
+      cpu: "500m"
+      memory: "16Gi"
     limits:
       cpu: "500m"
       memory: "64Gi"

diff --git a/skaffold.yaml b/skaffold.yaml
@@ -35,6 +35,7 @@ deploy:
         chartPath: charts/substra-backend
         valuesFiles:
           - examples/values/backend-org-1.yaml
+          - charts/substra-backend/resources-dev.yaml
         namespace: org-1
         setValues:
           _: _
@@ -59,6 +60,7 @@ deploy:
         chartPath: charts/substra-backend
         valuesFiles:
           - examples/values/backend-org-2.yaml
+          - charts/substra-backend/resources-dev.yaml
         namespace: org-2
         setValues:
           _: _
@@ -194,6 +196,7 @@ profiles:
           chartPath: charts/substra-backend
           valuesFiles:
             - examples/values/backend-org-3.yaml
+            - charts/substra-backend/resources-dev.yaml
           namespace: org-3
           setValues:
             _: _