From 4e94ef2d592b9026a48cd1598cb790082b6f98a5 Mon Sep 17 00:00:00 2001 From: "Image Builder Bot[tm]" Date: Sun, 17 Nov 2024 21:18:44 +0000 Subject: [PATCH 1/9] update nature image tag to af4ec86477a4 --- deployments/nature/hubploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/nature/hubploy.yaml b/deployments/nature/hubploy.yaml index 23a35532a..c270f371c 100644 --- a/deployments/nature/hubploy.yaml +++ b/deployments/nature/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-user-image:5e8a9c7735f9 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-user-image:af4ec86477a4 cluster: provider: gcloud From fcabb62dd84bdce3038afcecf89818a74c01524c Mon Sep 17 00:00:00 2001 From: "Image Builder Bot[tm]" Date: Mon, 18 Nov 2024 18:38:08 +0000 Subject: [PATCH 2/9] update nature image tag to 7ea78449c906 --- deployments/nature/hubploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/nature/hubploy.yaml b/deployments/nature/hubploy.yaml index c270f371c..671a0827b 100644 --- a/deployments/nature/hubploy.yaml +++ b/deployments/nature/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-user-image:af4ec86477a4 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-user-image:7ea78449c906 cluster: provider: gcloud From 2fc69b96e82c449daf2b76efd1f35aef3f4f4f3c Mon Sep 17 00:00:00 2001 From: "Image Builder Bot[tm]" Date: Mon, 18 Nov 2024 21:06:48 +0000 Subject: [PATCH 3/9] update a11y image tag to 6515cad7fcf5 --- deployments/a11y/hubploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/a11y/hubploy.yaml b/deployments/a11y/hubploy.yaml index 0d471d0f3..37d7fe8fc 100644 --- a/deployments/a11y/hubploy.yaml +++ b/deployments/a11y/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:b3796e35c42c + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:6515cad7fcf5 cluster: provider: gcloud From 9b13f29d48582ea06256bf558a670c5822a6ab94 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Mon, 18 Nov 2024 14:12:53 -0800 Subject: [PATCH 4/9] debump mcb201b RAM --- deployments/biology/config/common.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/deployments/biology/config/common.yaml b/deployments/biology/config/common.yaml index dfe1f1d50..7027381ea 100644 --- a/deployments/biology/config/common.yaml +++ b/deployments/biology/config/common.yaml @@ -61,10 +61,14 @@ jupyterhub: course::1524699::group::all-admins: mem_limit: 4096M mem_guarantee: 4096M - course::1537301: # MCELLBI 201B, https://github.com/berkeley-dsep-infra/datahub/issues/6385 - mem_limit: 5120M - mem_guarantee: 5120M +# course::1537301: # MCELLBI 201B, https://github.com/berkeley-dsep-infra/datahub/issues/6385 +# mem_limit: 5120M +# mem_guarantee: 5120M + + course::1536425: # IB 134L, https://github.com/berkeley-dsep-infra/datahub/issues/6481 + mem_limit: 8192M + mem_guarantee: 8192M # BioE C149, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6205 course::1537116::enrollment_type::teacher: From c6d7e2e097b5ab0a89dcd9264a1dac1076f701c8 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Mon, 18 Nov 2024 14:15:42 -0800 Subject: [PATCH 5/9] Removing the stanza --- deployments/biology/config/common.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/deployments/biology/config/common.yaml b/deployments/biology/config/common.yaml index 7027381ea..eebb07a4d 100644 --- a/deployments/biology/config/common.yaml +++ b/deployments/biology/config/common.yaml @@ -62,10 +62,6 @@ jupyterhub: mem_limit: 4096M mem_guarantee: 4096M -# course::1537301: # MCELLBI 201B, https://github.com/berkeley-dsep-infra/datahub/issues/6385 -# mem_limit: 5120M -# mem_guarantee: 5120M - course::1536425: # IB 134L, https://github.com/berkeley-dsep-infra/datahub/issues/6481 mem_limit: 8192M mem_guarantee: 8192M From d631bdfd3cf33fe75c2bf360bd83f64c7731d7f5 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Mon, 18 Nov 2024 14:37:45 -0800 Subject: [PATCH 6/9] Enable shared directories in a11y hub --- deployments/a11y/config/common.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/deployments/a11y/config/common.yaml b/deployments/a11y/config/common.yaml index d61312239..21a74c2d1 100644 --- a/deployments/a11y/config/common.yaml +++ b/deployments/a11y/config/common.yaml @@ -45,6 +45,19 @@ jupyterhub: # this role will be assigned to... groups: - course::1535449::group::admin + + custom: + group_profiles: + # DataHub Infrastructure staff + # https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607 + course::1524699::group::all-admins: + admin: true + admin: + extraVolumeMounts: + - name: home + mountPath: /home/jovyan/shared-readwrite + subPath: _shared + singleuser: extraFiles: # DH-216 @@ -64,6 +77,11 @@ jupyterhub: static: pvcName: home-nfs-v3 subPath: "{username}" + extraVolumeMounts: + - name: home + mountPath: /home/jovyan/shared + subPath: _shared + readOnly: true memory: guarantee: 3G limit: 3G From 9f2516413bd37813965a0ae050d4e07fbe7f90df Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Mon, 18 Nov 2024 15:02:25 -0800 Subject: [PATCH 7/9] Make it clear that the default RAM is 1 GB --- .github/ISSUE_TEMPLATE/higher-resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/higher-resources.md b/.github/ISSUE_TEMPLATE/higher-resources.md index 01c2039fa..7e5283df9 100644 --- a/.github/ISSUE_TEMPLATE/higher-resources.md +++ b/.github/ISSUE_TEMPLATE/higher-resources.md @@ -30,7 +30,7 @@ An approximate number would do. **How much RAM per user is needed?** -The default is 1GB of RAM per student. +The default is 1 GB (One GB) of RAM per student. **Why does this class need this much RAM?** From 092d91cb6c95a56dd10c31517a17065273f47bec Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Mon, 18 Nov 2024 15:20:06 -0800 Subject: [PATCH 8/9] Increase Data 101 Hub's RAM to 3 GB --- deployments/data101/config/common.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/data101/config/common.yaml b/deployments/data101/config/common.yaml index a9fecd2cd..fb4b3ed58 100644 --- a/deployments/data101/config/common.yaml +++ b/deployments/data101/config/common.yaml @@ -219,8 +219,8 @@ jupyterhub: - name: mongodb mountPath: /data/db memory: - guarantee: 2G - limit: 2G + guarantee: 3G + limit: 3G custom: group_profiles: From a79356d65ec0e92d48ba6995d74d51324976f7d4 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 18 Nov 2024 15:40:02 -0800 Subject: [PATCH 9/9] remove extra comment and fix typo --- .github/workflows/deploy-node-placeholder.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy-node-placeholder.yaml b/.github/workflows/deploy-node-placeholder.yaml index a227b2c7e..f26a61bca 100644 --- a/.github/workflows/deploy-node-placeholder.yaml +++ b/.github/workflows/deploy-node-placeholder.yaml @@ -1,5 +1,4 @@ name: Deploy node placeholder helm chart -# use echo ${VAR##*: } to get the value of a variable that is a string with a colon in it on: workflow_dispatch: push: @@ -21,7 +20,7 @@ jobs: with: fetch-depth: 0 # OR "2" -> To retrieve the preceding commit. - - name: Check if the nbde placeholder helm chart needs to be deployed + - name: Check if the node placeholder helm chart needs to be deployed run: | echo "PR labels: ${{ steps.pr-labels.outputs.labels }}" for label in $(echo -e "${{ steps.pr-labels.outputs.labels }}"); do