merging 6257/6262/6263/6264 to prod

.circleci/config.yml

@@ -181,12 +181,6 @@ jobs:
           command: |
             gcloud components install gke-gcloud-auth-plugin
 
-      - run:
-          name: Deploy data100
-          command: |
-            hubploy deploy --timeout 30m data100 hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy datahub
           command: |
@@ -227,15 +221,6 @@ workflows:
   version: 2
   test-build-images:
     jobs:
-      - hubploy/build-image:
-          deployment: data100
-          name: data100 image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
       - hubploy/build-image:
           deployment: datahub
           # Workshop hub also uses this
@@ -249,14 +234,6 @@ workflows:
 
   deploy:
     jobs:
-      - hubploy/build-image:
-          deployment: data100
-          name: data100 image build
-          push: true
-          filters:
-              branches:
-                only:
-                - staging
       - hubploy/build-image:
           # workshop hub also uses this image
           deployment: datahub
@@ -273,7 +250,6 @@ workflows:
       # CI level, we also make prod deploys go faster!
       - deploy:
           requires:
-              - data100 image build
               - datahub image build
 
           filters:

.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 publichealth eecs julia data102 ischool data8)
+          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 julia data102 ischool data8 data100)
 
   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 publichealth eecs julia data102 ischool data8)
+          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 julia data102 ischool data8 data100)

deployments/biology/config/common.yaml

@@ -79,6 +79,25 @@ jupyterhub:
             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-readwrite
+      course::1537301::enrollment_type::ta:
+        extraVolumeMounts:
+          - name: home
+            mountPath: /home/jovyan/mcb201b-shared-readwrite
+            subPath: _shared/course/mcb201b-shared-readwrite
+      course::1537301::enrollment_type::student:
+        extraVolumeMounts:
+          - name: home
+            mountPath: /home/jovyan/mcb201b-shared
+            subPath: _shared/course/mcb201b-shared
+            readOnly: true
+
   singleuser:
     extraEnv:
       # Unset NotebookApp from hub/values. Necessary for recent lab versions.

deployments/data100/hubploy.yaml

@@ -1,14 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-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/data100-user-image:d3a95b9af686
 
 cluster:
   provider: gcloud

deployments/data100/image/README.md

@@ -0,0 +1,5 @@
+# Data100 Image
+
+This image is now located [in its own repo](https://github.com/berkeley-dsep-infra/data100-user-image).
+
+Please see [the contribution guide](https://github.com/berkeley-dsep-infra/data100-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image.

scripts/user-image-management/repos.txt

@@ -3,6 +3,7 @@ [email protected]:berkeley-dsep-infra/astro-user-image.git
 [email protected]:berkeley-dsep-infra/biology-user-image.git
 [email protected]:berkeley-dsep-infra/cee-user-image.git
 [email protected]:berkeley-dsep-infra/data8-user-image.git
+[email protected]:berkeley-dsep-infra/data100-user-image.git
 [email protected]:berkeley-dsep-infra/data101-user-image.git
 [email protected]:berkeley-dsep-infra/data102-user-image.git
 [email protected]:berkeley-dsep-infra/dev-primary-image.git