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

Merge 6684, 6689 and 6691 to prod
berkeley-dsep-infra · Jan 22, 2025 · 3d7330c · 3d7330c
2 parents b42d99e + 00b15b5
commit 3d7330c
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 28 deletions.
diff --git a/deployments/data101/hubploy.yaml b/deployments/data101/hubploy.yaml
@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data101-user-image:131decc9433b
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data101-user-image:90863a9c33e1
 
 cluster:
   provider: gcloud

diff --git a/deployments/datahub/hubploy.yaml b/deployments/datahub/hubploy.yaml
@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:a846956fbaad
 
 cluster:
   provider: gcloud

diff --git a/deployments/dlab/hubploy.yaml b/deployments/dlab/hubploy.yaml
@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:a846956fbaad
       path: ../datahub/images/default
 
 cluster:

diff --git a/deployments/highschool/hubploy.yaml b/deployments/highschool/hubploy.yaml
@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:a846956fbaad
       path: ../datahub/images/default
 
 cluster:

diff --git a/deployments/prob140/config/common.yaml b/deployments/prob140/config/common.yaml
@@ -49,19 +49,19 @@ jupyterhub:
       #    - course::N::enrollment_type::teacher
       #    - course::N::enrollment_type::ta
 
-     # Data C140, Fall 2024, #https://github.com/berkeley-dsep-infra/datahub/issues/6011
-      #course-staff-1537389:
+     # Data C140, Spring 2025, #https://github.com/berkeley-dsep-infra/datahub/issues/6690
+      course-staff-1541933:
       #  description: Enable course staff to view and access servers.
       #  # this role provides permissions to...
-       # scopes:
-       #   - admin-ui
-       #   - list:users!group=course::1537389
-       #   - admin:servers!group=course::1537389
-       #   - access:servers!group=course::1537389
+        scopes:
+          - admin-ui
+          - list:users!group=course::1541933
+          - admin:servers!group=course::1541933
+          - access:servers!group=course::1541933
       #  # this role will be assigned to...
-       # groups:
-       #   - course::1537389::enrollment_type::teacher
-       #   - course::1537389::enrollment_type::ta
+        groups:
+          - course::1541933::enrollment_type::teacher
+          - course::1541933::enrollment_type::ta
     nodeSelector:
       hub.jupyter.org/pool-name: core-pool-2024-05-08
 

diff --git a/deployments/prob140/hubploy.yaml b/deployments/prob140/hubploy.yaml
@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:a846956fbaad
 
 cluster:
   provider: gcloud

diff --git a/deployments/publichealth/config/common.yaml b/deployments/publichealth/config/common.yaml
@@ -38,19 +38,19 @@ jupyterhub:
         groups:
           - course::1524699::group::all-admins
 
-      # PHW 142, Fall 2024, #https://github.com/berkeley-dsep-infra/datahub/issues/6026
-      #course-staff-1537782:
+      # PHW 142, Spring 2025, #https://github.com/berkeley-dsep-infra/datahub/issues/6685
+      course-staff-1540322:
         # description: Enable course staff to view and access servers.
         # this role provides permissions to...
-        #scopes:
-        #  - admin-ui
-        #  - list:users!group=course::1537782
-        #  - admin:servers!group=course::1537782
-        #  - access:servers!group=course::1537782
+        scopes:
+          - admin-ui
+          - list:users!group=course::1540322
+          - admin:servers!group=course::1540322
+          - access:servers!group=course::1540322
         # this role will be assigned to...
-        #groups:
-         # - course::1537782::enrollment_type::teacher
-         # - course::1537782::enrollment_type::ta
+        groups:
+          - course::1540322::enrollment_type::teacher
+          - course::1540322::enrollment_type::ta
 
     extraConfig:
       # Use 1x-<title> in `common.yaml` extraConfig values.

diff --git a/deployments/r/hubploy.yaml b/deployments/r/hubploy.yaml
@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:a846956fbaad
 
 cluster:
   provider: gcloud

diff --git a/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml b/deployments/template/{{cookiecutter.hub_name}}/hubploy.yaml
@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:a846956fbaad
 
 cluster:
   provider: gcloud

diff --git a/deployments/workshop/hubploy.yaml b/deployments/workshop/hubploy.yaml
@@ -1,6 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:8275a72a7278
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:a846956fbaad
 
 cluster:
   provider: gcloud