From e0385be602fe3ed2939abeba2c8f0143883a8032 Mon Sep 17 00:00:00 2001
From: Balaji Alwar <balajialwar@berkeley.edu>
Date: Tue, 28 Jan 2025 12:03:11 -0800
Subject: [PATCH 1/2] Add configs for data 101 elevated privileges

---
 deployments/data101/config/common.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/deployments/data101/config/common.yaml b/deployments/data101/config/common.yaml
index 9ffb5b383..e9bf00df2 100644
--- a/deployments/data101/config/common.yaml
+++ b/deployments/data101/config/common.yaml
@@ -56,19 +56,19 @@ jupyterhub:
       #  groups:
       #    - course::N::group::Admins
 
-      # Data 101, Fall 2024, #https://jira-secure.berkeley.edu/browse/DH-364
-      #course-staff-1536858:
+      # Data 101, Spring 2025, #https://github.com/berkeley-dsep-infra/datahub/issues/6722
+      course-staff-1542742:
         # 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::1542742
+          - admin:servers!group=course::1542742
+          - access:servers!group=course::1542742
         # this role will be assigned to...
-        #groups:
-         # - course::1536858::enrollment_type::teacher
-          #- course::1536858::enrollment_type::ta
+        groups:
+          - course::1542742::enrollment_type::teacher
+          - course::1542742::enrollment_type::ta
 
     extraConfig:
       data101-new-db: |

From c574a4fe24aea2b2b5f81d722e7d3c4498eccf0f Mon Sep 17 00:00:00 2001
From: Jonathan Felder <felder@berkeley.edu>
Date: Tue, 28 Jan 2025 17:58:15 -0800
Subject: [PATCH 2/2] [DH-459] fixing edx prod

---
 deployments/edx/config/prod.yaml | 3 +++
 hub/values.yaml                  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/deployments/edx/config/prod.yaml b/deployments/edx/config/prod.yaml
index 315859251..e31dc4877 100644
--- a/deployments/edx/config/prod.yaml
+++ b/deployments/edx/config/prod.yaml
@@ -16,3 +16,6 @@ jupyterhub:
     services:
       otter_grade:
         url: http://grader-srv.datahub.berkeley.edu:10101
+    image:
+      name: gcr.io/ucb-datahub-2018/jupyterhub-hub
+      tag: '20240731-224556.git.8057.h9643afd4'
diff --git a/hub/values.yaml b/hub/values.yaml
index 54254a3bc..19b1bd9f1 100644
--- a/hub/values.yaml
+++ b/hub/values.yaml
@@ -232,6 +232,7 @@ jupyterhub:
       Authenticator:
         enable_auth_state: true
         manage_groups: true
+      OAuthenticator:
         allow_all: true
       KubeSpawner:
         # Make sure working directory is ${HOME}