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 5811/5812/5813/5817/5829/5830/5833/5836 to prod #5837

Merged
merged 25 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8f2af6e
Bump a11y-checker and test whether it fixes usability issues
balajialg Jun 19, 2024
33c5c59
Merge pull request #5811 from balajialg/a11y-pypi
balajialg Jun 19, 2024
ef81dff
Installing gh-scoped-creds app in dev hub secondary image
balajialg Jun 20, 2024
aa0abf0
Reverting geopandas version
balajialg Jun 20, 2024
44654bf
Merge pull request #5812 from balajialg/gh-scoped-creds-test
balajialg Jun 20, 2024
1325392
troubleshooting dev hub's deploy failure
balajialg Jun 20, 2024
2025317
Moving extra_env under kubespawner_override stanza
balajialg Jun 20, 2024
8d719ad
Merge pull request #5813 from balajialg/dev_tshoot
balajialg Jun 21, 2024
198e4d6
Moving extra_env under kubespawner_override stanza
balajialg Jun 20, 2024
d31382f
Fixing extraenv with env
balajialg Jun 25, 2024
547bb3d
Merge branch 'staging' into gh-scoped-creds-env
balajialg Jun 25, 2024
a6008bb
Merge pull request #5817 from balajialg/gh-scoped-creds-env
balajialg Jun 25, 2024
5a72a23
Install quarto in Dev hub(dashboard image)
balajialg Jul 1, 2024
d5db7b5
Add support for hidden files in Datahub
balajialg Jul 1, 2024
bd41200
Making changes tovalues.yaml instead of hub specific config
balajialg Jul 2, 2024
70c8dbc
Install quarto in dev hub
balajialg Jul 2, 2024
b41dc73
Enable elevated privileges for PH 142 course staff for FA 24
balajialg Jul 2, 2024
f5890ee
Removing comment about culling
balajialg Jul 2, 2024
b83d17c
Merge pull request #5830 from balajialg/hidden_files
balajialg Jul 2, 2024
070c7a7
Add extra line at the end
balajialg Jul 2, 2024
2eefd47
Add an extra line at the end of config
balajialg Jul 2, 2024
4e2ab7f
Merge pull request #5833 from balajialg/ph142_fa24
balajialg Jul 2, 2024
2a5a9a5
Merge pull request #5829 from balajialg/dev_quarto
balajialg Jul 2, 2024
161b97c
Providing elevated privileges for Data 8 course staff
balajialg Jul 2, 2024
d7cde6e
Merge pull request #5836 from balajialg/data8_su24
balajialg Jul 3, 2024
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 deployments/a11y/image/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies:
- nbconvert-a11y==2023.12.6
- nb2pdf==0.6.2
- nbpdfexport==0.2.1
- jupyterlab-a11y-checker==0.1.1
- jupyterlab-a11y-checker==0.1.2
# ###
# The items below are from infra-requirements, however lab conflicts with the
# alpha notebook.
Expand Down
20 changes: 10 additions & 10 deletions deployments/data8/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,19 @@ jupyterhub:
# - course::N::enrollment_type::teacher
# - course::N::enrollment_type::ta

# Data 8, Spring 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5358
#course-staff-1532352:
# Data 8, Summer 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5834
course-staff-1535365:
# description: Enable course staff to view and access servers.
# # this role provides permissions to...
# scopes:
# - admin-ui
# - list:users!group=course::1532352
# - admin:servers!group=course::1532352
# - access:servers!group=course::1532352
scopes:
- admin-ui
- list:users!group=course::1535365
- admin:servers!group=course::1535365
- access:servers!group=course::1535365
# # this role will be assigned to...
# groups:
# - course::1532352::enrollment_type::teacher
# - course::1532352::enrollment_type::ta
groups:
- course::1535365::enrollment_type::teacher
- course::1535365::enrollment_type::ta

singleuser:
extraFiles:
Expand Down
3 changes: 3 additions & 0 deletions deployments/dev/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ jupyterhub:
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:36280727a
env:
GH_SCOPED_CREDS_CLIENT_ID: "Iv23liFjgKFgkSBWph4C"
GH_SCOPED_CREDS_APP_URL: "https://github.com/apps/test-gh-scoped-creds"
- display_name: "1524699: DataHub Infrastructure"
slug: "1524699"
description: "Regular image with per-course subpath."
Expand Down
5 changes: 2 additions & 3 deletions deployments/dev/images/secondary/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ dependencies:
- scipy==1.10.1
- seaborn==0.12.2
- statsmodels==0.14.0
- tensorflow-cpu==2.12.1
- sqlalchemy==2.0.16
- mlxtend==0.23.0
# Spring 2024 data 100
Expand All @@ -57,7 +56,7 @@ dependencies:
#- otter-grader==5.5.0
#- python-duckdb==1.0.0
#- jupyterhub==5.0.0

- quarto==1.4.550
- pip
- pip:
# - -r infra-requirements.txt
Expand All @@ -73,4 +72,4 @@ dependencies:
- ydata-profiling==4.6.4
- otter-grader==5.4.0
- duckdb==0.10.1
- duckdb_engine==0.11.2
- duckdb_engine==0.11.2
3 changes: 2 additions & 1 deletion deployments/dev/images/secondary/install.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env r
#!/usr/bin/env R

# Function to install R packages with specific versions
class_libs_install_version <- function(class_name, class_libs) {
print(paste("Installing packages for", class_name))
for (i in seq(1, length(class_libs), 2)) {
Expand Down
22 changes: 11 additions & 11 deletions deployments/publichealth/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ jupyterhub:
groups:
- course::1524699::group::all-admins

# PHW 142, Spring 2024, #5368
#course-staff-1532521:
# description: Enable course staff to view and access servers.
# PHW 142, Fall 2024, #5831
course-staff-1535789:
# description: Enable course staff to view and access servers.
# this role provides permissions to...
# scopes:
# - admin-ui
# - list:users!group=course::1532521
# - admin:servers!group=course::1532521
# - access:servers!group=course::1532521
scopes:
- admin-ui
- list:users!group=course::1535789
- admin:servers!group=course::1535789
- access:servers!group=course::1535789
# this role will be assigned to...
# groups:
# - course::1532521::enrollment_type::teacher
# - course::1532521::enrollment_type::ta
groups:
- course::1535789::enrollment_type::teacher
- course::1535789::enrollment_type::ta

extraConfig:
# Use 1x-<title> in `common.yaml` extraConfig values.
Expand Down
8 changes: 8 additions & 0 deletions hub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@ jupyterhub:
HistoryManager:
# We do not need to keep around history for IPython, and especially not on NFS
enabled: false
jupyter_server_config.json:
mountPath: /usr/local/etc/jupyter/jupyter_server_config.json
data:
# Allow JupyterLab to show the 'View -> Show Hidden Files' option
# in the menu. Defaults are not changed.
# https://github.com/jupyterlab/jupyterlab/issues/11304#issuecomment-945466766
ContentsManager:
allow_hidden: true
culling-config:
mountPath: /etc/jupyter/jupyter_notebook_config.json
data:
Expand Down
Loading