berkeley-dsep-infra · shaneknapp · Sep 11, 2024 · Sep 9, 2024 · Sep 9, 2024 · Sep 9, 2024
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -217,12 +217,6 @@ jobs:
             hubploy deploy --timeout 30m edx hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy eecs
-          command: |
-            hubploy deploy --timeout 30m eecs hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy highschool hub
           command: |
@@ -247,12 +241,6 @@ jobs:
             hubploy deploy --timeout 30m prob140 hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy publichealth
-          command: |
-            hubploy deploy --timeout 30m publichealth hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy R
           command: |
@@ -314,15 +302,6 @@ workflows:
                 ignore:
                 - staging
                 - prod
-      - hubploy/build-image:
-          deployment: eecs
-          name: eecs image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
       - hubploy/build-image:
           deployment: ischool
           name: ischool image build
@@ -341,15 +320,6 @@ workflows:
                 ignore:
                 - staging
                 - prod
-      - hubploy/build-image:
-          deployment: publichealth
-          name: publichealth image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
 
   deploy:
     jobs:
@@ -397,15 +367,6 @@ workflows:
               branches:
                 only:
                 - staging
-      - hubploy/build-image:
-          deployment: eecs
-          name: eecs image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
       - hubploy/build-image:
           deployment: ischool
           name: ischool image build
@@ -424,15 +385,6 @@ workflows:
               branches:
                 only:
                 - staging
-      - hubploy/build-image:
-          deployment: publichealth
-          name: publichealth image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
       # Build images only during the staging deploy. All merges
       # to prod need to go via staging, so prod should *never*
       # use images not built for staging. By enforcing this at the
@@ -444,10 +396,8 @@ workflows:
               - data102 image build
               - datahub image build
               - edx image build
-              - eecs image build
               - ischool image build
               - julia hub image build
-              - publichealth image build
 
           filters:
             branches:

diff --git a/.github/workflows/deploy-hubs.yaml b/.github/workflows/deploy-hubs.yaml
@@ -103,7 +103,7 @@ jobs:
             echo "Deploying single-user image and hub config to ${deployment}"
             hubploy --verbose deploy --timeout 30m ${deployment} hub staging
             echo
-          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy gradebook logodev shiny stat159 stat20 nature a11y ugr01 data101 astro biology cee dev)
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy gradebook logodev shiny stat159 stat20 nature a11y ugr01 data101 astro biology cee dev publichealth eecs)
 
   deploy-hubs-to-prod:
     if: github.event_name == 'push' && github.ref == 'refs/heads/prod'
@@ -198,4 +198,4 @@ jobs:
             echo "Deploying single-user image and hub config to ${deployment}"
             hubploy --verbose deploy --timeout 30m ${deployment} hub prod
             echo
-          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy gradebook logodev shiny stat159 stat20 nature a11y ugr01 data101 astro biology cee dev)
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy gradebook logodev shiny stat159 stat20 nature a11y ugr01 data101 astro biology cee dev publichealth eecs)
diff --git a/deployments/biology/hubploy.yaml b/deployments/biology/hubploy.yaml
@@ -1,5 +1,5 @@
 images:
-  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/biology-user-image:8540bb31ea44
+  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/biology-user-image:16c6e661dcd5
 
 cluster:
   provider: gcloud

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:0e1d41cf9936
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data101-user-image:010ca9abfb71
 
 cluster:
   provider: gcloud

diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml
@@ -76,7 +76,20 @@ jupyterhub:
       #  # this role will be assigned to...
         groups:
           - course::1536576::enrollment_type::teacher
-          - course::1536576::enrollment_type::ta
+          - 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
 
     nodeSelector:
       hub.jupyter.org/pool-name: core-pool-2024-05-08

diff --git a/deployments/eecs/hubploy.yaml b/deployments/eecs/hubploy.yaml
@@ -1,14 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/eecs-user-image
-      path: image/
-      repo2docker:
-        base_image: docker.io/library/buildpack-deps:jammy
-  registry:
-    provider: gcloud
-    gcloud:
-      project: ucb-datahub-2018
-      service_key: gcr-key.json
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/eecs-user-image:4e62ae874442
 
 cluster:
   provider: gcloud

diff --git a/deployments/eecs/image/README.md b/deployments/eecs/image/README.md
@@ -0,0 +1,5 @@
+# eecs Image
+
+This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/eecs-user-image).
+
+Please see [the contribution guide](https://github.com/berkeley-dsep-infra/eecs-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image.
diff --git a/deployments/eecs/image/apt.txt b/deployments/eecs/image/apt.txt
diff --git a/deployments/eecs/image/environment.yml b/deployments/eecs/image/environment.yml
diff --git a/deployments/eecs/image/infra-requirements.txt b/deployments/eecs/image/infra-requirements.txt
diff --git a/deployments/eecs/image/postBuild b/deployments/eecs/image/postBuild
diff --git a/deployments/eecs/image/start b/deployments/eecs/image/start
diff --git a/deployments/publichealth/hubploy.yaml b/deployments/publichealth/hubploy.yaml
@@ -1,12 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/publichealth-user-image
-      path: image
-  registry:
-    provider: gcloud
-    gcloud:
-      project: ucb-datahub-2018
-      service_key: gcr-key.json
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/publichealth-user-image:8b70e125f905
 
 cluster:
   provider: gcloud