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

Merging #6117, #6118, #6122, #6123, #6124, #6126 to prod
berkeley-dsep-infra · Sep 9, 2024 · fa075d5 · fa075d5
2 parents 358d854 + f9434ea
commit fa075d5
Show file tree

Hide file tree

Showing 25 changed files with 34 additions and 551 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -205,12 +205,6 @@ jobs:
             hubploy deploy --timeout 30m datahub hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-      - run:
-          name: Deploy dev
-          command: |
-            hubploy deploy --timeout 30m dev hub ${CIRCLE_BRANCH}
-          no_output_timeout: 30m
-
       - run:
           name: Deploy dlab
           command: |
@@ -247,12 +241,6 @@ jobs:
             hubploy deploy --timeout 30m julia hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-#      - run:
-#          name: Deploy logodev
-#          command: |
-#            hubploy deploy --timeout 30m logodev hub ${CIRCLE_BRANCH}
-#          no_output_timeout: 30m
-
       - run:
           name: Deploy prob140
           command: |
@@ -317,17 +305,6 @@ workflows:
                 ignore:
                 - staging
                 - prod
-      - hubploy/build-image:
-          # This has no effect yet because docker-py doesn't support buildkit.
-          #environment:
-          #  DOCKER_BUILDKIT: 1
-          deployment: dev
-          name: dev image build
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
       - hubploy/build-image:
           deployment: edx
           name: edx image build
@@ -364,15 +341,6 @@ workflows:
                 ignore:
                 - staging
                 - prod
-#      - hubploy/build-image:
-#          deployment: logodev
-#          name: logodev hub image build
-#          # Filters can only be per-job? wtf
-#          filters:
-#              branches:
-#                ignore:
-#                - staging
-#                - prod
       - hubploy/build-image:
           deployment: publichealth
           name: publichealth image build
@@ -420,15 +388,6 @@ workflows:
               branches:
                 only:
                 - staging
-      - hubploy/build-image:
-          deployment: dev
-          name: dev image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
       - hubploy/build-image:
           deployment: edx
           name: edx image build
@@ -465,15 +424,6 @@ workflows:
               branches:
                 only:
                 - staging
-#      - hubploy/build-image:
-#          deployment: logodev
-#          name: logodev image build
-#          push: true
-#          # Filters can only be per-job? wtf
-#          filters:
-#              branches:
-#                only:
-#                - staging
       - hubploy/build-image:
           deployment: publichealth
           name: publichealth image build
@@ -493,12 +443,10 @@ workflows:
               - data100 image build
               - data102 image build
               - datahub image build
-              - dev image build
               - edx image build
               - eecs image build
               - ischool image build
               - julia hub image build
-#              - logodev image build
               - publichealth image build
 
           filters:

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)
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy gradebook logodev shiny stat159 stat20 nature a11y ugr01 data101 astro biology cee dev)
 
   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)
+          done < <(python .github/scripts/determine-hub-deployments.py --only-deploy gradebook logodev shiny stat159 stat20 nature a11y ugr01 data101 astro biology cee dev)
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:24ed6d3bf1a6
+  image_name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/biology-user-image:8540bb31ea44
 
 cluster:
   provider: gcloud

diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml
@@ -236,3 +236,7 @@ jupyterhub:
       course::1537045: # ESPM 157, https://github.com/berkeley-dsep-infra/datahub/issues/5914
         mem_limit: 4096M
         mem_guarantee: 4096M
+
+      course::1539545: # Demog 213, https://github.com/berkeley-dsep-infra/datahub/issues/6094
+        mem_limit: 4096M
+        mem_guarantee: 4096M
diff --git a/deployments/dev/config/common.yaml b/deployments/dev/config/common.yaml
@@ -74,7 +74,7 @@ jupyterhub:
       - display_name: "Dashboard image"
         description: "A newer repo2docker-based image with a primary focus of building dashboards."
         kubespawner_override:
-          image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary:36280727a
+          image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary-image:df11f4f1caa1
       - display_name: "1524699: DataHub Infrastructure"
         slug: "1524699"
         description: "Regular image with per-course subpath."

diff --git a/deployments/dev/hubploy.yaml b/deployments/dev/hubploy.yaml
@@ -1,16 +1,11 @@
+# you will also need to update config/common.yaml to include the following for
+# the secondary image tag:
+# kubespawner_override:
+#   image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary-image:df11f4f1caa1
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-user-image
-      path: images/default
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary
-      path: images/secondary
-      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/dev-primary-image:6000a5694eab
+    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary-image:df11f4f1caa1
 
 cluster:
   provider: gcloud

diff --git a/deployments/dev/image/README.md b/deployments/dev/image/README.md
@@ -0,0 +1,5 @@
+# Dev Image
+
+These images are now located [in their](https://github.com/berkeley-dsep-infra/dev-primary-image) [own repos](https://github.com/berkeley-dsep-infra/dev-secondary-image).
+
+Please see [the contribution guide](https://github.com/berkeley-dsep-infra/dev-user-image/blob/main/CONTRIBUTING.md) for instructions on how to propose changes to the image.
diff --git a/deployments/dev/images/default/Dockerfile b/deployments/dev/images/default/Dockerfile
diff --git a/deployments/dev/images/default/Rprofile.site b/deployments/dev/images/default/Rprofile.site
diff --git a/deployments/dev/images/default/apt.txt b/deployments/dev/images/default/apt.txt
diff --git a/deployments/dev/images/default/class-libs.R b/deployments/dev/images/default/class-libs.R