Skip to content

Commit

Permalink
Merge branch 'staging' into ps191_shared
Browse files Browse the repository at this point in the history
  • Loading branch information
balajialg authored Jan 17, 2025
2 parents 7afa5b0 + 47fbff7 commit 07cdef3
Show file tree
Hide file tree
Showing 52 changed files with 142 additions and 169 deletions.
10 changes: 4 additions & 6 deletions deployments/a11y/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,10 @@ jupyterhub:
# 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
extraVolumeMounts:
- name: home
mountPath: /home/jovyan/shared-readwrite
subPath: _shared

singleuser:
extraFiles:
Expand Down
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:88cc27e0b9f4
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:6dcc885aabf9

cluster:
provider: gcloud
Expand Down
10 changes: 4 additions & 6 deletions deployments/astro/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@ jupyterhub:
# https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
course::1524699::group::all-admins:
mem_limit: 4G

admin:
extraVolumeMounts:
- name: home
mountPath: /home/jovyan/shared-readwrite
subPath: _shared
extraVolumeMounts:
- name: home
mountPath: /home/jovyan/shared-readwrite
subPath: _shared
2 changes: 1 addition & 1 deletion deployments/astro/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
images:
image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/astro-user-image:ffc76921fb47
image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/astro-user-image:0063ed5f1d8f

cluster:
provider: gcloud
Expand Down
9 changes: 4 additions & 5 deletions deployments/biology/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,16 @@ jupyterhub:
groups:
- course::1524699::group::biology-admins
custom:
admin:
extraVolumeMounts:
- name: home
mountPath: /home/jovyan/shared-readwrite
subPath: _shared
group_profiles:
# DataHub Infrastructure staff
# https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
course::1524699::group::all-admins:
mem_limit: 4096M
mem_guarantee: 4096M
extraVolumeMounts:
- name: home
mountPath: /home/jovyan/shared-readwrite
subPath: _shared

singleuser:
extraEnv:
Expand Down
2 changes: 1 addition & 1 deletion deployments/biology/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
images:
image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/biology-user-image:7b13faa6244d
image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/biology-user-image:d86c6301a927

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/cee/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/cee-user-image:5e393b8d22ce
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/cee-user-image:09ff7873876d

cluster:
provider: gcloud
Expand Down
17 changes: 7 additions & 10 deletions deployments/data100/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,11 @@ jupyterhub:
# DataHub Infrastructure staff
# https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
course::1524699::group::all-admins:
admin: true
mem_limit: 4G

admin:
mem_guarantee: 2G
extraVolumeMounts:
- name: home
mountPath: /srv/homes
- name: home
mountPath: /home/jovyan/shared-readwrite
subPath: _shared
mem_guarantee: 2G
extraVolumeMounts:
- name: home
mountPath: /srv/homes
- name: home
mountPath: /home/jovyan/shared-readwrite
subPath: _shared
2 changes: 1 addition & 1 deletion deployments/data100/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/data100-user-image:6ffa8f224124
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image:99a49eef8870

cluster:
provider: gcloud
Expand Down
6 changes: 2 additions & 4 deletions deployments/data101/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,5 @@ jupyterhub:
# DataHub Infrastructure staff
# https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
course::1524699::group::all-admins:
admin: true
admin:
mem_limit: 4G
mem_guarantee: 2G
mem_limit: 4G
mem_guarantee: 2G
2 changes: 1 addition & 1 deletion deployments/data101/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/data101-user-image:ba209883023b
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data101-user-image:d9c593d14110

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/data102/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/data102-user-image:1ae8a9184467
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data102-user-image:926368b429c3

cluster:
provider: gcloud
Expand Down
8 changes: 3 additions & 5 deletions deployments/data8/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ jupyterhub:
# DataHub Infrastructure staff
# https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
course::1524699::group::all-admins:
admin: true
admin:
extraVolumeMounts:
- name: home
mountPath: /srv/homes
extraVolumeMounts:
- name: home
mountPath: /srv/homes

scheduling:
userScheduler:
Expand Down
2 changes: 1 addition & 1 deletion deployments/data8/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/data8-user-image:84d9c800dba0
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data8-user-image:cc074e31975e

cluster:
provider: gcloud
Expand Down
24 changes: 24 additions & 0 deletions deployments/datahub/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,20 @@ jupyterhub:
groups:
- course::1524699::group::all-admins

# Linguistics 243, Spring 2025, https://github.com/berkeley-dsep-infra/datahub/issues/6604
course-staff-1541622:
# description: Enable course staff to view and access servers.
# # this role provides permissions to...
scopes:
- admin-ui
- list:users!group=course::1541622
- admin:servers!group=course::1541622
- access:servers!group=course::1541622
# # this role will be assigned to...
groups:
- course::1541622::enrollment_type::teacher
- course::1541622::enrollment_type::ta

nodeSelector:
hub.jupyter.org/pool-name: core-pool-2024-05-08
initContainers:
Expand Down Expand Up @@ -137,3 +151,13 @@ jupyterhub:
course::1524699::group::all-admins:
mem_limit: 4096M
mem_guarantee: 4096M

# ENVECON 153, Spring 25, https://github.com/berkeley-dsep-infra/datahub/issues/6575
course::1541477:
mem_limit: 4096M
mem_guarantee: 4096M

# ECON 148, Spring 25, https://github.com/berkeley-dsep-infra/datahub/issues/6576
course::1541056:
mem_limit: 4096M
mem_guarantee: 4096M
2 changes: 1 addition & 1 deletion deployments/datahub/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/datahub-user-image:ff6231004232
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278

cluster:
provider: gcloud
Expand Down
4 changes: 1 addition & 3 deletions deployments/dev/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jupyterhub:
- display_name: "Dashboard image"
description: "A newer repo2docker-based image with a primary focus of building dashboards."
kubespawner_override:
image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary-image:df11f4f1caa1
image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary-image:d6d4f9f9b632
- display_name: "1524699: DataHub Infrastructure"
slug: "1524699"
description: "Regular image with per-course subpath."
Expand Down Expand Up @@ -117,11 +117,9 @@ jupyterhub:
#
# # Some other class 200, Spring '23; requested in #98776
# course::234567::enrollment_type::teacher:
# admin: true
# mem_limit: 2096M
# mem_guarantee: 2048M
# course::234567::enrollment_type::ta:
# admin: true
# mem_limit: 2096M
# mem_guarantee: 2048M

Expand Down
2 changes: 1 addition & 1 deletion deployments/dev/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-primary-image:958c7b2e32e3
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary-image:df11f4f1caa1
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary-image:d6d4f9f9b632

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/dlab/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/datahub-user-image:ff6231004232
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278
path: ../datahub/images/default

cluster:
Expand Down
2 changes: 1 addition & 1 deletion deployments/edx/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/data8x-scratch/user-images/edx-user-image:44cfbcb5cc13
- name: us-central1-docker.pkg.dev/data8x-scratch/user-images/edx-user-image:f6de2e6dd229

cluster:
provider: gcloud
Expand Down
3 changes: 2 additions & 1 deletion deployments/eecs/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,5 @@ jupyterhub:
# DataHub Infrastructure staff
# https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
course::1524699::group::all-admins:
admin: true
mem_limit: 2G
mem_guarantee: 2G
2 changes: 1 addition & 1 deletion deployments/eecs/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/eecs-user-image:cd59fd081aad
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/eecs-user-image:fbaa642ad7a5

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/highschool/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/datahub-user-image:ff6231004232
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278
path: ../datahub/images/default

cluster:
Expand Down
2 changes: 1 addition & 1 deletion deployments/ischool/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/ischool-user-image:e1aa95b55ec2
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/ischool-user-image:051e68a97669

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/julia/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
images:
image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/julia-user-image:c4a48d8f2160
image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/julia-user-image:fb504b6c71b2

cluster:
provider: gcloud
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:7ea78449c906
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-user-image:4f3bcec71659

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/prob140/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/datahub-user-image:ff6231004232
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278

cluster:
provider: gcloud
Expand Down
3 changes: 2 additions & 1 deletion deployments/publichealth/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,5 @@ jupyterhub:
group_profiles:
# https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
course::1524699::group::all-admins:
admin: true
mem_limit: 2G
mem_guarantee: 2G
2 changes: 1 addition & 1 deletion deployments/publichealth/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/publichealth-user-image:8b87bf198328
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/publichealth-user-image:8691f424a693

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/r/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jupyterhub:
mem_limit: 2048M
mem_guarantee: 2048M

# PS 191, Spring 25, https://github.com/berkeley-dsep-infra/datahub/issues/6593
# PolSci 191, Spring 25, https://github.com/berkeley-dsep-infra/datahub/issues/6593
course::1541486:
mem_limit: 6144M
mem_guarantee: 6144M
Expand Down
2 changes: 1 addition & 1 deletion deployments/r/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/datahub-user-image:ff6231004232
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278

cluster:
provider: gcloud
Expand Down
10 changes: 4 additions & 6 deletions deployments/stat159/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,7 @@ jupyterhub:
# 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
extraVolumeMounts:
- name: home
mountPath: /home/jovyan/shared-readwrite
subPath: _shared
1 change: 0 additions & 1 deletion deployments/stat20/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ jupyterhub:
# DataHub Infrastructure staff
# https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
course::1524699::group::all-admins:
admin: true
mem_limit: 12G
# Shared directory to read logs data from every semester
extraVolumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion deployments/stat20/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
images:
image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/stat20-user-image:509d361d776c
image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/stat20-user-image:bf3646d1ec3c

cluster:
provider: gcloud
Expand Down
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/datahub-user-image:ff6231004232
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/workshop/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/datahub-user-image:ff6231004232
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278

cluster:
provider: gcloud
Expand Down
Loading

0 comments on commit 07cdef3

Please sign in to comment.