Skip to content

Commit e963f30

Browse files
authored
Merge pull request #3211 from yuvipanda/mem-limit
Increase and centralize build memory limits
2 parents 5380d1f + 2b32370 commit e963f30

File tree

4 files changed

+2
-13
lines changed

4 files changed

+2
-13
lines changed

config/hetzner-2i2c-bare.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,7 @@ binderhub:
3535
image_prefix: registry.2i2c-bare.mybinder.org/i-
3636
# image_prefix: quay.io/mybinder-hetzner-2i2c/image-
3737
# build_docker_host: /var/run/dind/docker.sock
38-
# TODO: we should have CPU requests, too
39-
# use this to limit the number of builds per node
40-
# complicated: dind memory request + KubernetesBuildExecutor.memory_request * builds_per_node ~= node memory
4138
KubernetesBuildExecutor:
42-
memory_request: "2G"
43-
memory_limit: "4G"
4439
docker_host: /var/run/dind/docker.sock
4540
repo2docker_extra_args:
4641
# try to avoid timeout pushing to local registry

config/hetzner-2i2c.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,7 @@ binderhub:
3535
image_prefix: registry.2i2c.mybinder.org/i-
3636
# image_prefix: quay.io/mybinder-hetzner-2i2c/image-
3737
# build_docker_host: /var/run/dind/docker.sock
38-
# TODO: we should have CPU requests, too
39-
# use this to limit the number of builds per node
40-
# complicated: dind memory request + KubernetesBuildExecutor.memory_request * builds_per_node ~= node memory
4138
KubernetesBuildExecutor:
42-
memory_request: "2G"
43-
memory_limit: "4G"
4439
docker_host: /var/run/dind/docker.sock
4540
repo2docker_extra_args:
4641
# try to avoid timeout pushing to local registry

config/staging.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ binderhub:
1010
badge_base_url: https://staging.mybinder.org
1111
image_prefix: us-central1-docker.pkg.dev/binderhub-288415/staging/r2d-2023-04-
1212
sticky_builds: true
13-
build_memory_limit: "2G"
1413
DockerRegistry:
1514
token_url: "https://us-central1-docker.pkg.dev/v2/token"
1615

mybinder/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ binderhub:
218218
}
219219
KubernetesBuildExecutor:
220220
build_image: quay.io/jupyterhub/repo2docker:2024.07.0-68.gdd097a2
221-
memory_limit: "3G"
222-
memory_request: "1G"
221+
memory_limit: "6G"
222+
memory_request: "2G"
223223

224224
extraConfig:
225225
# Send Events to StackDriver on Google Cloud

0 commit comments

Comments
 (0)