Merge pull request #3205 from jupyterhub/revert-3204-no-mem

yuvipanda · web-flow · commit e7b2dc80d685 · 2025-01-29T22:07:29.000-08:00
Revert "Don't set a per-build memory limit"
diff --git a/config/hetzner-2i2c-bare.yaml b/config/hetzner-2i2c-bare.yaml
@@ -40,6 +40,7 @@ binderhub:
     # complicated: dind memory request + KubernetesBuildExecutor.memory_request * builds_per_node ~= node memory
     KubernetesBuildExecutor:
       memory_request: "2G"
+      memory_limit: "4G"
       docker_host: /var/run/dind/docker.sock
       repo2docker_extra_args:
         # try to avoid timeout pushing to local registry
diff --git a/config/hetzner-2i2c.yaml b/config/hetzner-2i2c.yaml
@@ -40,6 +40,7 @@ binderhub:
     # complicated: dind memory request + KubernetesBuildExecutor.memory_request * builds_per_node ~= node memory
     KubernetesBuildExecutor:
       memory_request: "2G"
+      memory_limit: "4G"
       docker_host: /var/run/dind/docker.sock
       repo2docker_extra_args:
         # try to avoid timeout pushing to local registry
diff --git a/config/staging.yaml b/config/staging.yaml
@@ -10,6 +10,7 @@ binderhub:
       badge_base_url: https://staging.mybinder.org
       image_prefix: us-central1-docker.pkg.dev/binderhub-288415/staging/r2d-2023-04-
       sticky_builds: true
+      build_memory_limit: "2G"
     DockerRegistry:
       token_url: "https://us-central1-docker.pkg.dev/v2/token"
 
diff --git a/mybinder/values.yaml b/mybinder/values.yaml
@@ -218,6 +218,7 @@ binderhub:
           }
     KubernetesBuildExecutor:
       build_image: quay.io/jupyterhub/repo2docker:2024.07.0-68.gdd097a2
+      memory_limit: "3G"
       memory_request: "1G"
 
   extraConfig:

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,7 @@ binderhub:`
`218`	`218`	`}`
`219`	`219`	`KubernetesBuildExecutor:`
`220`	`220`	`build_image: quay.io/jupyterhub/repo2docker:2024.07.0-68.gdd097a2`
	`221`	`+ memory_limit: "3G"`
`221`	`222`	`memory_request: "1G"`
`222`	`223`
`223`	`224`	`extraConfig:`