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

Merge #6549, #6567, #6568, #6569, #6572.

deployments/astro/config/common.yaml

@@ -91,10 +91,6 @@ jupyterhub:
   # formerly jupyterhub.hub.extraConfigMap
   custom:
     group_profiles:
-      # Astro Lab 128, Spring 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5596
-      course::1537100: # Temporarily bump down to 4G RAM to all students
-        mem_limit: 4G
-        mem_guarantee: 4G
     admin:
       extraVolumeMounts:
         - name: home

deployments/biology/config/common.yaml

@@ -62,64 +62,6 @@ jupyterhub:
         mem_limit: 4096M
         mem_guarantee: 4096M
 
-      course::1536425: # IB 134L, https://github.com/berkeley-dsep-infra/datahub/issues/6481
-        mem_limit: 8192M
-        mem_guarantee: 8192M
-
-      # BioE C149, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6205
-      course::1537116::enrollment_type::teacher:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/bioe-c149-readwrite
-            subPath: _shared/course/bioe-c149-shared
-      course::1537116::enrollment_type::ta:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/bioe-c149-readwrite
-            subPath: _shared/course/bioe-c149-shared
-      course::1537116::enrollment_type::student:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/bioe-c149-shared
-            subPath: _shared/course/bioe-c149-shared
-            readOnly: true
-
-      # MCB 201B, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6255
-      course::1537301::enrollment_type::teacher:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/mcb201b-shared-readwrite
-            subPath: _shared/course/mcb201b-shared
-      course::1537301::enrollment_type::ta:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/mcb201b-shared-readwrite
-            subPath: _shared/course/mcb201b-shared
-      course::1537301::enrollment_type::student:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/mcb201b-shared
-            subPath: _shared/course/mcb201b-shared
-            readOnly: true
-
-      # IB 134L, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6453
-      course::1536425::enrollment_type::teacher:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/IB134L-shared-readwrite
-            subPath: _shared/course/IB134L-shared
-      course::1536425::enrollment_type::ta:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/IB134L-shared-readwrite
-            subPath: _shared/course/IB134L-shared
-      course::1536425::enrollment_type::student:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/IB134L-shared
-            subPath: _shared/course/IB134L-shared
-            readOnly: true
-
   singleuser:
     extraEnv:
       # Unset NotebookApp from hub/values. Necessary for recent lab versions.

deployments/data100/config/common.yaml

@@ -41,30 +41,19 @@ jupyterhub:
         # this role will be assigned to...
         groups:
           - course::1524699::group::all-admins
+
        #Data 100, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6458
-      course-staff-1537664:
-      #  description: Enable course staff to view and access servers.
-        # this role provides permissions to...
-        scopes:
-          - admin-ui
-          - list:users!group=course::1537664
-          - admin:servers!group=course::1537664
-          - access:servers!group=course::1537664
-        # this role will be assigned to...
-        groups:
-          - course::1537664::group::Admins
-      # Econ 148, Spring 2024, DH-225
-      #course-staff-1532866:
+      #course-staff-1537664:
       #  description: Enable course staff to view and access servers.
         # this role provides permissions to...
-      #  scopes:
-      #    - admin-ui
-      #    - list:users!group=course::1532866
-      #   - admin:servers!group=course::1532866
-      #    - access:servers!group=course::1532866
+       # scopes:
+        #  - admin-ui
+        #  - list:users!group=course::1537664
+        #  - admin:servers!group=course::1537664
+        #  - access:servers!group=course::1537664
         # this role will be assigned to...
-      #  groups:
-      #   - course::1532866::group::admin
+        #groups:
+         # - course::1537664::group::Admins
 
 #  prePuller:
 #    extraImages:
@@ -112,23 +101,6 @@ jupyterhub:
         admin: true
         mem_limit: 4G
 
-      # Data C100, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6316
-      course::1537664::enrollment_type::teacher:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/data100-shared-readwrite
-            subPath: _shared/course/data100-shared
-      course::1537664::enrollment_type::ta:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/data100-shared-readwrite
-            subPath: _shared/course/data100-shared
-      course::1537664::enrollment_type::student:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/data100-shared
-            subPath: _shared/course/data100-shared
-            readOnly: true
     admin:
       mem_guarantee: 2G
       extraVolumeMounts:

deployments/data101/config/common.yaml

@@ -57,18 +57,18 @@ jupyterhub:
       #    - course::N::group::Admins
 
       # Data 101, Fall 2024, #https://jira-secure.berkeley.edu/browse/DH-364
-      course-staff-1536858:
+      #course-staff-1536858:
         # description: Enable course staff to view and access servers.
         # this role provides permissions to...
-        scopes:
-          - admin-ui
-          - list:users!group=course::1536858
-          - admin:servers!group=course::1536858
-          - access:servers!group=course::1536858
+        #scopes:
+         # - admin-ui
+         # - list:users!group=course::1536858
+         # - admin:servers!group=course::1536858
+         # - access:servers!group=course::1536858
         # this role will be assigned to...
-        groups:
-          - course::1536858::enrollment_type::teacher
-          - course::1536858::enrollment_type::ta
+        #groups:
+         # - course::1536858::enrollment_type::teacher
+          #- course::1536858::enrollment_type::ta
 
     extraConfig:
       data101-new-db: |

deployments/data8/config/common.yaml

@@ -71,18 +71,18 @@ jupyterhub:
       #    - course::N::enrollment_type::ta
 
       # Data 8, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6014
-      course-staff-1538208:
+      #course-staff-1538208:
       #  description: Enable course staff to view and access servers.
       #  # this role provides permissions to...
-        scopes:
-          - admin-ui
-          - list:users!group=course::1538208
-          - admin:servers!group=course::1538208
-          - access:servers!group=course::1538208
+       # scopes:
+        #  - admin-ui
+        #  - list:users!group=course::1538208
+         # - admin:servers!group=course::1538208
+         # - access:servers!group=course::1538208
       #  # this role will be assigned to...
-        groups:
-          - course::1538208::enrollment_type::teacher
-          - course::1538208::enrollment_type::ta
+        #groups:
+         # - course::1538208::enrollment_type::teacher
+         # - course::1538208::enrollment_type::ta
 
   singleuser:
     extraFiles:

deployments/datahub/config/common.yaml

@@ -36,100 +36,6 @@ jupyterhub:
         groups:
           - course::1524699::group::all-admins
 
-      # Data 6, Summer 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5847
-      course-staff-1535590:
-      #  description: Enable course staff to view and access servers.
-      #  # this role provides permissions to...
-        scopes:
-          - admin-ui
-          - list:users!group=course::1535590
-          - admin:servers!group=course::1535590
-          - access:servers!group=course::1535590
-      #  # this role will be assigned to...
-        groups:
-          - course::1535590::enrollment_type::teacher
-          - course::1535590::enrollment_type::ta
-
-      # COMPSS 202, Summer 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5861
-      course-staff-1535811:
-      #  description: Enable course staff to view and access servers.
-      #  # this role provides permissions to...
-        scopes:
-          - admin-ui
-          - list:users!group=course::1535811
-          - admin:servers!group=course::1535811
-          - access:servers!group=course::1535811
-      #  # this role will be assigned to...
-        groups:
-          - course::1535811::enrollment_type::teacher
-          - course::1535811::enrollment_type::ta
-
-      # MBA 247, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5923
-      course-staff-1536576:
-      #  description: Enable course staff to view and access servers.
-      #  # this role provides permissions to...
-        scopes:
-          - admin-ui
-          - list:users!group=course::1536576
-          - admin:servers!group=course::1536576
-          - access:servers!group=course::1536576
-      #  # this role will be assigned to...
-        groups:
-          - course::1536576::enrollment_type::teacher
-          - course::1536576::enrollment_type::ta          
-
-      # BIOE C131, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6139
-      course-staff-1538361:
-      #  description: Enable course staff to view and access servers.
-      #  # this role provides permissions to...
-        scopes:
-          - list:users!group=course::1538361
-          - admin:servers!group=course::1538361
-          - access:servers!group=course::1538361
-      #  # this role will be assigned to...
-        groups:
-          - 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
-
-      # 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:
@@ -231,55 +137,3 @@ jupyterhub:
       course::1524699::group::all-admins:
         mem_limit: 4096M
         mem_guarantee: 4096M
-
-      # MBA 247, Fall 2024
-      course::1536576::enrollment_type::teacher:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/mba-247-readwrite
-            subPath: _shared/course/mba-247
-      course::1536576::enrollment_type::ta:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/mba-247-readwrite
-            subPath: _shared/course/mba-247
-      course::1536576::enrollment_type::student:
-        extraVolumeMounts:
-          - name: home
-            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:
-          - name: home
-            mountPath: /home/jovyan/compss-214a-readwrite
-            subPath: _shared/course/compss-214a
-      course::1538139::enrollment_type::ta:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/compss-214a-readwrite
-            subPath: _shared/course/compss-214a
-      course::1538139::enrollment_type::student:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/compss-214a
-            subPath: _shared/course/compss-214a
-            readOnly: true
-
-      course::1535590: # Data 6, https://github.com/berkeley-dsep-infra/datahub/issues/5847
-        mem_limit: 2048M
-        mem_guarantee: 2048M
-
-      course::1537045: # ESPM 157, https://github.com/berkeley-dsep-infra/datahub/issues/5914
-        mem_limit: 4096M
-        mem_guarantee: 4096M
-
-      course::1539545: # Demog 213, https://github.com/berkeley-dsep-infra/datahub/issues/6094
-        mem_limit: 4096M
-        mem_guarantee: 4096M
-
-      course::1536576: # MBA 247, https://github.com/berkeley-dsep-infra/datahub/issues/6276
-        mem_limit: 2048M
-        mem_guarantee: 2048M

deployments/datahub/hubploy.yaml

@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:661364a51a63
 
 cluster:
   provider: gcloud

deployments/dlab/hubploy.yaml

@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:661364a51a63
       path: ../datahub/images/default
 
 cluster:

deployments/eecs/config/common.yaml

@@ -100,7 +100,3 @@ jupyterhub:
       # https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
       course::1524699::group::all-admins:
         admin: true
-
-      course::1537177: # ELENG 120, https://github.com/berkeley-dsep-infra/datahub/issues/6015
-        mem_limit: 4096M
-        mem_guarantee: 4096M

deployments/highschool/hubploy.yaml

@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:661364a51a63
       path: ../datahub/images/default
 
 cluster:

deployments/ischool/hubploy.yaml

@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/ischool-user-image:bf3004dcb234
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/ischool-user-image:7f769a0f30ae
 
 cluster:
   provider: gcloud