Merge pull request #6179 from berkeley-dsep-infra/staging

Merge 6162, 6180 to prod
berkeley-dsep-infra · Sep 13, 2024 · b144925 · b144925
2 parents 061a6d3 + e88fff0
commit b144925
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml
@@ -117,6 +117,19 @@ jupyterhub:
           - course::1538138::enrollment_type::teacher
           - course::1538138::enrollment_type::ta
 
+      # Data 6, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6158
+      course-staff-1538010:
+      #  description: Enable course staff to view and access servers.
+      #  # this role provides permissions to...
+        scopes:
+          - list:users!group=course::1538010
+          - admin:servers!group=course::1538010
+          - access:servers!group=course::1538010
+      #  # this role will be assigned to...
+        groups:
+          - course::1538010::enrollment_type::teacher
+          - course::1538010::enrollment_type::ta
+
     nodeSelector:
       hub.jupyter.org/pool-name: core-pool-2024-05-08
     initContainers:

diff --git a/deployments/datahub/images/default/environment.yml b/deployments/datahub/images/default/environment.yml
@@ -115,6 +115,9 @@ dependencies:
 - mystmd==1.3.1
 - jupyterlab-git==0.50.1
 
+# [DH-364] https://github.com/berkeley-dsep-infra/datahub/issues/6155
+- openpyxl==3.1.5
+
 - pip:
   # - -r /tmp/infra-requirements.txt
   # Econ 148, Spring 2023 https://github.com/berkeley-dsep-infra/datahub/issues/4093