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

merging 4996/5022/5029 to prod
berkeley-dsep-infra · Sep 14, 2023 · dd48b84 · dd48b84
2 parents 7489244 + ff33d6c
commit dd48b84
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 288 deletions.
diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml
@@ -28,7 +28,7 @@ jupyterhub:
           - access:servers!group=course::1527426
         # this role will be assigned to...
         groups:
-          - course::1527426::group::Admins 
+          - course::1527426::group::Admins
 
 #  prePuller:
 #    extraImages:
@@ -66,9 +66,12 @@ jupyterhub:
       # https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
       course::1524699::group::all-admins:
         admin: true
+      course::1527426::group::Content:
+        mem_limit: 4G
+        mem_guarantee: 4G
     admin:
       mem_limit: 4G
-      mem_guarantee: 4G
+      mem_guarantee: 2G
       extraVolumeMounts:
         - name: home
           mountPath: /srv/homes

diff --git a/deployments/data100/image/environment.yml b/deployments/data100/image/environment.yml
@@ -36,7 +36,6 @@ dependencies:
 - pip
 - pip:
   # - -r infra-requirements.txt
-  - jupysql==0.8.0
   - ipywidgets==8.0.7
   # disable until fixed (probably this:  https://github.com/jupyterlab/jupyter-collaboration/issues/162)
   # - jupyter_collaboration==1.0.1

diff --git a/images/fetch-course-emails/Dockerfile b/images/fetch-course-emails/Dockerfile
diff --git a/images/fetch-course-emails/README.md b/images/fetch-course-emails/README.md
diff --git a/images/fetch-course-emails/course-emails.py b/images/fetch-course-emails/course-emails.py
diff --git a/images/fetch-course-emails/requirements.txt b/images/fetch-course-emails/requirements.txt