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?** 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 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 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 diff --git a/deployments/biology/config/common.yaml b/deployments/biology/config/common.yaml index 6ee7d7173..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 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: diff --git a/deployments/nature/hubploy.yaml b/deployments/nature/hubploy.yaml index 23a35532a..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:5e8a9c7735f9 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-user-image:7ea78449c906 cluster: provider: gcloud