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

[DH-197] Remove course admin related configs across hubs #5283

Merged
merged 29 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
8e00468
Fix docs for jupyterhub.custom.
ryanlovett Jun 12, 2023
b346f57
Merge branch 'staging' of github.com:ryanlovett/datahub into staging
ryanlovett Dec 7, 2023
3ceaec6
Merge branch 'staging' of github.com:berkeley-dsep-infra/datahub into…
ryanlovett Dec 18, 2023
7c42335
Merge branch 'staging' of github.com:berkeley-dsep-infra/datahub into…
ryanlovett Dec 18, 2023
a9fc0a8
Replace admin list with all-admins.
ryanlovett Dec 18, 2023
84c20f6
Replace admin list with all-admins and astro-admins.
ryanlovett Dec 18, 2023
8fac166
Replace admin list with all-admins and biology-admins.
ryanlovett Dec 18, 2023
4031f9b
Replace admin list with all-admins.
ryanlovett Dec 18, 2023
b585039
Disable old course admins.
ryanlovett Dec 18, 2023
03bf8a6
Disable old course admins.
ryanlovett Dec 18, 2023
06161c9
Disable old course admins.
ryanlovett Dec 18, 2023
1bc8627
Replace admin list with all-admins.
ryanlovett Dec 18, 2023
d2880c4
Replace admin list with all-admins.
ryanlovett Dec 18, 2023
ffadb1e
Remove admin list.
ryanlovett Dec 18, 2023
db9e4f2
Add datahub-staff and disable old course admins.
ryanlovett Dec 18, 2023
17ee22d
Replace admin list with dlab-admins.
ryanlovett Dec 18, 2023
c166964
Replace admin list with datahub-staff and eecs-admins.
ryanlovett Dec 18, 2023
9212223
Add datahub-staff and ischool-admins.
ryanlovett Dec 18, 2023
bdc3b91
Replace admin list with datahub-admins.
ryanlovett Dec 18, 2023
3ee978d
Replace admin list with all-admins.
ryanlovett Dec 18, 2023
7898d9c
Disable old course admins.
ryanlovett Dec 18, 2023
04fafb5
Disable old courses. Add datahub-staff.
ryanlovett Dec 18, 2023
48d057a
Disable admin list.
ryanlovett Dec 18, 2023
d1744cd
Replace admin list with datahub-staff.
ryanlovett Dec 18, 2023
e6a9be8
Replace admin list with datahub-staff.
ryanlovett Dec 18, 2023
20d662d
Add datahub-staff.
ryanlovett Dec 18, 2023
63d06e3
Replace admin list with datahub-staff.
ryanlovett Dec 18, 2023
7f484c3
Replace admin list with datahub staff.
ryanlovett Dec 18, 2023
1e72970
Scope of astro hub is all servers.
ryanlovett Dec 18, 2023
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
26 changes: 16 additions & 10 deletions deployments/a11y/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,22 @@ jupyterhub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-07-11
config:
Authenticator:
admin_users:
# infrastructure
- balajialwar
- felder
- gmerritt
- rylo
- sknapp
# List of other admin users

loadRoles:
# datahub staff
datahub-staff:
description: Enable admin for datahub staff
# this role provides permissions to...
scopes:
- admin-ui
- admin:groups
- admin:users
- admin:servers
- read:roles
- read:hub
- access:servers
# this role will be assigned to...
groups:
- course::1524699::group::all-admins
singleuser:
extraEnv:
# Unset NotebookApp from hub/values. Necessary for recent lab versions.
Expand Down
42 changes: 28 additions & 14 deletions deployments/astro/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,34 @@ jupyterhub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-07-11
config:
Authenticator:
admin_users:
# infrastructure
- balajialwar
- felder
- gmerritt
- rylo
- sknapp
# List of other admin users
- nsabrams
- joshbloom
- aparsons
- jlu-astro

loadRoles:
# datahub staff
datahub-staff:
description: Enable admin for datahub staff
# this role provides permissions to...
scopes:
- admin-ui
- admin:groups
- admin:users
- admin:servers
- read:roles
- read:hub
- access:servers
# this role will be assigned to...
groups:
- course::1524699::group::all-admins
# astro admins
astro-admins:
description: Enable astro folks to view and access all servers.
# this role provides permissions to...
scopes:
- admin-ui
- list:users
- admin:servers
- access:servers
# this role will be assigned to...
groups:
- course::1524699::group::astro-admins
singleuser:
nodeSelector:
hub.jupyter.org/pool-name: astro-pool
Expand Down
42 changes: 28 additions & 14 deletions deployments/biology/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,34 @@ jupyterhub:
hub.jupyter.org/pool-name: core-pool-2023-07-11

config:
Authenticator:
admin_users:
# infrastructure
- balajialwar
- felder
- gmerritt
- rylo
- sknapp

# List of other admin users
- psudmant
- ingolia
- stacy-l

loadRoles:
# datahub staff
datahub-staff:
description: Enable admin for datahub staff
# this role provides permissions to...
scopes:
- admin-ui
- admin:groups
- admin:users
- admin:servers
- read:roles
- read:hub
- access:servers
# this role will be assigned to...
groups:
- course::1524699::group::all-admins
# biology admins
biology-admins:
description: Enable departmental folks to view and access all servers.
# this role provides permissions to...
scopes:
- admin-ui
- list:users
- admin:servers
- access:servers
# this role will be assigned to...
groups:
- course::1524699::group::biology-admins
custom:
admin:
extraVolumeMounts:
Expand Down
27 changes: 16 additions & 11 deletions deployments/cee/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,22 @@ jupyterhub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-07-11
config:
Authenticator:
admin_users:
# infrastructure
- balajialwar
- felder
- gmerritt
- rylo
- sknapp

# List of other admin users

loadRoles:
# datahub staff
datahub-staff:
description: Enable admin for datahub staff
# this role provides permissions to...
scopes:
- admin-ui
- admin:groups
- admin:users
- admin:servers
- read:roles
- read:hub
- access:servers
# this role will be assigned to...
groups:
- course::1524699::group::all-admins
singleuser:
defaultUrl: /desktop
nodeSelector:
Expand Down
29 changes: 22 additions & 7 deletions deployments/data100/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,33 @@ jupyterhub:
hub.jupyter.org/pool-name: core-pool-2023-07-11
config:
loadRoles:
# Data 100, Fall 2023
course-staff-1527426:
description: Enable course staff to view and access servers.
# datahub staff
datahub-staff:
description: Enable admin for datahub staff
# this role provides permissions to...
scopes:
- admin-ui
- list:users!group=course::1527426
- admin:servers!group=course::1527426
- access:servers!group=course::1527426
- admin:groups
- admin:users
- admin:servers
- read:roles
- read:hub
- access:servers
# this role will be assigned to...
groups:
- course::1527426::group::Admins
- course::1524699::group::all-admins
## Data 100, Spring 2024
#course-staff-N:
# description: Enable course staff to view and access servers.
# # this role provides permissions to...
# scopes:
# - admin-ui
# - list:users!group=course::N
# - admin:servers!group=course::N
# - access:servers!group=course::N
# # this role will be assigned to...
# groups:
# - course::N::group::Admins

# prePuller:
# extraImages:
Expand Down
29 changes: 22 additions & 7 deletions deployments/data101/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,33 @@ jupyterhub:
hub:
config:
loadRoles:
# Data 101, Fall 2023
course-staff-1528038:
description: Enable course staff to view and access servers.
# datahub staff
datahub-staff:
description: Enable admin for datahub staff
# this role provides permissions to...
scopes:
- admin-ui
- list:users!group=course::1528038
- admin:servers!group=course::1528038
- access:servers!group=course::1528038
- admin:groups
- admin:users
- admin:servers
- read:roles
- read:hub
- access:servers
# this role will be assigned to...
groups:
- course::1528038::group::Admins
- course::1524699::group::all-admins
## Data 101, Spring 2024
#course-staff-N:
# description: Enable course staff to view and access servers.
# # this role provides permissions to...
# scopes:
# - admin-ui
# - list:users!group=course::N
# - admin:servers!group=course::N
# - access:servers!group=course::N
# # this role will be assigned to...
# groups:
# - course::N::group::Admins
extraConfig:
data101-new-db: |
from jupyterhub.utils import exponential_backoff
Expand Down
26 changes: 13 additions & 13 deletions deployments/data102/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ jupyterhub:
# this role will be assigned to...
groups:
- course::1524699::group::all-admins
# Data 102, Fall 2023, #4941
course-staff-1526710:
description: Enable course staff to view and access servers.
# this role provides permissions to...
scopes:
- admin-ui
- list:users!group=course::1526710
- admin:servers!group=course::1526710
- access:servers!group=course::1526710
# this role will be assigned to...
groups:
- course::1526710::enrollment_type::teacher
- course::1526710::enrollment_type::ta
## Data 102, Spring 2024, #xyz
#course-staff-N:
# description: Enable course staff to view and access servers.
# # this role provides permissions to...
# scopes:
# - admin-ui
# - list:users!group=course::N
# - admin:servers!group=course::N
# - access:servers!group=course::N
# # this role will be assigned to...
# groups:
# - course::N::enrollment_type::teacher
# - course::N::enrollment_type::ta

singleuser:
defaultUrl: "/lab"
Expand Down
39 changes: 23 additions & 16 deletions deployments/data8/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,35 @@ jupyterhub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-07-11
config:
#Authenticator:
# admin_users:
# # infrastructure
# - balajialwar
# - felder
# - gmerritt
# - rylo
# - sknapp
loadRoles:
# Data 8, Summer 2023
course-staff-1525580:
description: Enable course staff to view and access servers.
# datahub staff
datahub-staff:
description: Enable admin for datahub staff
# this role provides permissions to...
scopes:
- admin-ui
- list:users!group=course::1525580
- admin:servers!group=course::1525580
- access:servers!group=course::1525580
- admin:groups
- admin:users
- admin:servers
- read:roles
- read:hub
- access:servers
# this role will be assigned to...
groups:
- course::1525580::enrollment_type::teacher
- course::1525580::enrollment_type::ta
- course::1524699::group::all-admins
## Data 8, Spring 2024
#course-staff-N:
# description: Enable course staff to view and access servers.
# # this role provides permissions to...
# scopes:
# - admin-ui
# - list:users!group=course::N
# - admin:servers!group=course::N
# - access:servers!group=course::N
# # this role will be assigned to...
# groups:
# - course::N::enrollment_type::teacher
# - course::N::enrollment_type::ta

singleuser:
nodeSelector:
Expand Down
Loading