Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merging 6488/6489/6490/6491/6494/6495/6496/6497 to prod #6493

Merged
merged 18 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/higher-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?**

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/deploy-node-placeholder.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand Down
18 changes: 18 additions & 0 deletions deployments/a11y/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion deployments/a11y/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 0 additions & 4 deletions deployments/biology/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deployments/data101/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ jupyterhub:
- name: mongodb
mountPath: /data/db
memory:
guarantee: 2G
limit: 2G
guarantee: 3G
limit: 3G

custom:
group_profiles:
Expand Down
2 changes: 1 addition & 1 deletion deployments/nature/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading