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

Merging #6211, #6212, #6213, #6214, #6218 to prod

.circleci/config.yml

@@ -193,12 +193,6 @@ jobs:
             hubploy deploy --timeout 30m data100 hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy data102
-          command: |
-            hubploy deploy --timeout 30m data102 hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy datahub
           command: |
@@ -269,14 +263,6 @@ workflows:
                 ignore:
                 - staging
                 - prod
-      - hubploy/build-image:
-          deployment: data102
-          name: data102 image build
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
       - hubploy/build-image:
           deployment: datahub
           # Workshop hub also uses this
@@ -325,14 +311,6 @@ workflows:
               branches:
                 only:
                 - staging
-      - hubploy/build-image:
-          deployment: data102
-          name: data102 image build
-          push: true
-          filters:
-              branches:
-                only:
-                - staging
       - hubploy/build-image:
           # workshop hub also uses this image
           deployment: datahub
@@ -369,7 +347,6 @@ workflows:
           requires:
               - data8 image build
               - data100 image build
-              - data102 image build
               - datahub image build
               - edx image build
               - ischool image build

.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)
+          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)
 
   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)
+          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)

deployments/data100/config/common.yaml

@@ -112,10 +112,17 @@ jupyterhub:
         admin: true
         mem_limit: 4G
 
-      # Data 100, Spring 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5376
-      #course::1531798::group::Admins: # Spring 2024, Data 100 Admins, ensured 4G RAM
-      #  mem_limit: 4G
-      #  mem_guarantee: 4G
+      # Data 100, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6167
+      course::1537664::enrollment_type::teacher: # Fall 2024, Data 100 Instructors, ensured 16G RAM
+        mem_limit: 16G
+        mem_guarantee: 16G
+        cpu_limit: 2
+        cpu_guarantee: 2
+      course::1537664::enrollment_type::ta: # Fall 2024, Data 100 TAs, ensured 16G RAM
+        mem_limit: 16G
+        mem_guarantee: 16G
+        cpu_limit: 2
+        cpu_guarantee: 2
     admin:
       mem_guarantee: 2G
       extraVolumeMounts:

deployments/data102/hubploy.yaml

@@ -1,9 +1,6 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data102-user-image
-      path: image/
-      repo2docker:
-        base_image: docker.io/library/buildpack-deps:jammy
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data102-user-image:PLACEHOLDER
 
   registry:
     provider: gcloud

deployments/data102/image/README.md

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

hub/values.yaml

@@ -38,14 +38,14 @@ jupyterhub:
       # https://github.com/http-party/node-http-proxy/pull/1559
       # https://github.com/Jimbly/http-proxy-node16/commit/56283e33edfc7aad8c2605dd493da8a196b4371d
       # https://github.com/consideRatio/configurable-http-proxy/commits/main/
-      #
+      # https://jira-secure.berkeley.edu/browse/DH-382 timeouts break stuff
       image:
         tag: 4.6.2
-      extraCommandLineFlags:
+      # extraCommandLineFlags:
         # set the timeout and proxyTimeout to 5 seconds
         # https://github.com/http-party/node-http-proxy?tab=readme-ov-file#options
-        - "--timeout=5000"
-        - "--proxy-timeout=5000"
+        # - "--timeout=5000"
+        # - "--proxy-timeout=5000"
       resources:
         requests:
           # FIXME: We want no guarantees here!!!

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/data101-user-image.git
+[email protected]:berkeley-dsep-infra/data102-user-image.git
 [email protected]:berkeley-dsep-infra/dev-primary-image.git
 [email protected]:berkeley-dsep-infra/dev-secondary-image.git
 [email protected]:berkeley-dsep-infra/eecs-user-image.git