From cb9806d096959b543cc7126550ec7d7183ef6d23 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Mon, 27 Jan 2025 18:39:24 +0200 Subject: [PATCH] Enable imagebuilding for leap --- config/clusters/leap/daskhub-common.values.yaml | 10 ++++++++++ config/clusters/leap/enc-public.secret.values.yaml | 7 +++++-- config/clusters/leap/enc-staging.secret.values.yaml | 9 ++++++--- config/clusters/leap/public.values.yaml | 10 ++++++++++ terraform/gcp/projects/leap.tfvars | 4 ++++ 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/config/clusters/leap/daskhub-common.values.yaml b/config/clusters/leap/daskhub-common.values.yaml index 9cfeaeb44e..7360883d47 100644 --- a/config/clusters/leap/daskhub-common.values.yaml +++ b/config/clusters/leap/daskhub-common.values.yaml @@ -169,6 +169,8 @@ basehub: cpu_limit: 64 image: &profile_list_profile_options_image display_name: Image + dynamic_image_building: + enabled: True unlisted_choice: &profile_list_unlisted_choice enabled: True display_name: "Custom image" @@ -367,3 +369,11 @@ basehub: mem_guarantee: 24G extra_resource_limits: nvidia.com/gpu: "1" + binderhub-service: + enabled: true + config: + BinderHub: + image_prefix: us-central1-docker.pkg.dev/leap-pangeo/imagebuilding-registry/ + buildPodsRegistryCredentials: + server: https://us-central1-docker.pkg.dev + username: "_json_key" diff --git a/config/clusters/leap/enc-public.secret.values.yaml b/config/clusters/leap/enc-public.secret.values.yaml index 0ba9f77a6c..9db94202b8 100644 --- a/config/clusters/leap/enc-public.secret.values.yaml +++ b/config/clusters/leap/enc-public.secret.values.yaml @@ -1,3 +1,6 @@ +binderhub-service: + buildPodsRegistryCredentials: + password: ENC[AES256_GCM,data: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,iv:hzQrc+7LAGb67cwxwQR2/E7u//E56nvY+p1NZI0IAls=,tag:cNgHdt6SIFi5jL/eY1g9qw==,type:str] jupyterhub: hub: config: @@ -13,8 +16,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2024-05-24T13:21:23Z" - mac: ENC[AES256_GCM,data:jwlBwrmBTcv4DPqC66I+lz6DUMBsVBupMSv7XJIQphlClsodJGN/niJweqsAGpVIfYA8OKkiI+8Af6MwDpHmuFOBI65apmae1t9tbA2b6KXr8nFzr743h4UBtob/ZlmWFsRT7fZOeu/Ht900bBiQeizQ5MFNcLFM5GRfT2IAUV0=,iv:U3LPnYwYrkjJfmvGBSxcs7SMed19Ef5r62XxgSjS+EI=,tag:CwTpOkGhl90dALInByzAaQ==,type:str] + lastmodified: "2025-01-27T16:03:24Z" + mac: ENC[AES256_GCM,data:6gyIfhWDgdu6G9WaLT6xfiRq1yibaHVn6bOFTzPZz1UD1+v5wyEIB0IeAOIGcid6WbS7GaJqKx+brdtD8eijabfum/WY1jEL0PirShOtn1DdLuhy4pkdh1KD6ow2G2QPTvpbBhugIftOZGDlzLK5mHnhy+n5BxH7McSVI4MMqQk=,iv:gwIIijgS/Ibc6DLmQ5oMSM2m57j4cAzjCl/om9Jor60=,tag:kpkTE4CR/kk12SOWyx+NeQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/config/clusters/leap/enc-staging.secret.values.yaml b/config/clusters/leap/enc-staging.secret.values.yaml index afd4da8341..a648e73f6a 100644 --- a/config/clusters/leap/enc-staging.secret.values.yaml +++ b/config/clusters/leap/enc-staging.secret.values.yaml @@ -1,4 +1,7 @@ basehub: + binderhub-service: + buildPodsRegistryCredentials: + password: ENC[AES256_GCM,data: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,iv:+p6q9YTAdgfKSHVevWlNzwxkUsCJeAE9pfA2Q/h983c=,tag:uh5w9brxgTtC/woFv5R4qA==,type:str] jupyterhub: hub: config: @@ -14,8 +17,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-03-15T03:52:01Z" - mac: ENC[AES256_GCM,data:H2VetTwomSuEk84ut0G5XKLmXTh2Mp1R8Mvwj7X0mOiPTVhpw8FnqLCy+DfrcPGD5Yv3f2gyROWCaDv29L1mJkwBk+vxF63AjcljaR48/sOn+oo2c0xOIigrqluU/FFBvqJL7Lcrrt8X1TNbM1e4bu8ckJILfbqQO2c+WfNrSBM=,iv:wbIOKcrVddBAHDLY/snwG+Oc0pC3YQGgKRAMDzoQlY4=,tag:ZHNFCNamz1CZLGU4j0LXCw==,type:str] + lastmodified: "2025-01-27T16:06:44Z" + mac: ENC[AES256_GCM,data:s4c+Y26XCO98SJvAVRnswLxq28uydO6o6+9hcKFCtMf4i8ckvxTCLUWin0gQ3E+NvBAQSbS04FFATfsSCureqGXfkhuw2S7ICqGN7fC7As57hHPhWENoLl6006bmXy8tELIM6PI3lna2NJbFlNRm3OcaOt/jVOf5sLq8/okd0EA=,iv:UXsykJVyncJMU8FeczRsF5PkmLbwhJpRyn3cciZ4JN8=,tag:HCchaYGmY8aUFwVTAI8zNw==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.7.1 + version: 3.8.1 diff --git a/config/clusters/leap/public.values.yaml b/config/clusters/leap/public.values.yaml index b73631980a..fee884220e 100644 --- a/config/clusters/leap/public.values.yaml +++ b/config/clusters/leap/public.values.yaml @@ -115,6 +115,8 @@ jupyterhub: cpu_limit: 3.45 image: display_name: Image + dynamic_image_building: + enabled: True unlisted_choice: enabled: True display_name: "Custom image" @@ -139,3 +141,11 @@ jupyterhub: slug: "pytorch" kubespawner_override: image: "pangeo/pytorch-notebook:2024.06.02" +binderhub-service: + enabled: true + config: + BinderHub: + image_prefix: us-central1-docker.pkg.dev/leap-pangeo/imagebuilding-registry + buildPodsRegistryCredentials: + server: https://us-central1-docker.pkg.dev + username: "_json_key" diff --git a/terraform/gcp/projects/leap.tfvars b/terraform/gcp/projects/leap.tfvars index 937fd18f6a..665c926f94 100644 --- a/terraform/gcp/projects/leap.tfvars +++ b/terraform/gcp/projects/leap.tfvars @@ -150,3 +150,7 @@ dask_nodes = { machine_type : "n2-highmem-16" }, } + +container_repos = [ + "imagebuilding", +] \ No newline at end of file