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

merging 6124/6154/6157 to prod

Author: shaneknapp

deployments/datahub/config/common.yaml

@@ -91,6 +91,32 @@ jupyterhub:
           - course::1538361::enrollment_type::teacher
           - course::1538361::enrollment_type::ta
 
+      # ER 131, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6137
+      course-staff-1538017:
+      #  description: Enable course staff to view and access servers.
+      #  # this role provides permissions to...
+        scopes:
+          - list:users!group=course::1538017
+          - admin:servers!group=course::1538017
+          - access:servers!group=course::1538017
+      #  # this role will be assigned to...
+        groups:
+          - course::1538017::enrollment_type::teacher
+          - course::1538017::enrollment_type::ta
+
+      # ECON 140, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6153
+      course-staff-1538138:
+      #  description: Enable course staff to view and access servers.
+      #  # this role provides permissions to...
+        scopes:
+          - list:users!group=course::1538138
+          - admin:servers!group=course::1538138
+          - access:servers!group=course::1538138
+      #  # this role will be assigned to...
+        groups:
+          - course::1538138::enrollment_type::teacher
+          - course::1538138::enrollment_type::ta
+
     nodeSelector:
       hub.jupyter.org/pool-name: core-pool-2024-05-08
     initContainers:
@@ -184,24 +210,6 @@ jupyterhub:
         mem_limit: 4096M
         mem_guarantee: 4096M
 
-      # Demog Data Event, April 1 - Sep 30, https://github.com/berkeley-dsep-infra/datahub/issues/5643
-      course::1534506::enrollment_type::teacher:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/demog-dataevent-readwrite
-            subPath: _shared/course/demog-dataevent
-      course::1534506::enrollment_type::ta:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/demog-dataevent-readwrite
-            subPath: _shared/course/demog-dataevent
-      course::1534506::enrollment_type::student:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/demog-dataevent
-            subPath: _shared/course/demog-dataevent
-            readOnly: true
-
       # MBA 247, Fall 2024
       course::1536576::enrollment_type::teacher:
         extraVolumeMounts:
@@ -219,7 +227,7 @@ jupyterhub:
             mountPath: /home/jovyan/mba-247
             subPath: _shared/course/mba-247
             readOnly: true
-
+            
       # COMPSS 214A, Fall 2024, https://jira-secure.berkeley.edu/browse/DH-311
       course::1538139::enrollment_type::teacher:
         extraVolumeMounts:
@@ -238,10 +246,6 @@ jupyterhub:
             subPath: _shared/course/compss-214a
             readOnly: true
 
-      course::1534506: # Demog Data Event, April 1 - Sep 30, https://github.com/berkeley-dsep-infra/datahub/issues/5643
-        mem_limit: 8192M
-        mem_guarantee: 8192M
-
       course::1535590: # Data 6, https://github.com/berkeley-dsep-infra/datahub/issues/5847
         mem_limit: 2048M
         mem_guarantee: 2048M

deployments/logodev/hubploy.yaml

@@ -1,7 +1,7 @@
 images:
   images:
     # temporary update
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/logodev-user-image:cb7832b0a131
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/logodev-user-image:ae0f4c4e7753
 
 cluster:
   provider: gcloud