merging 5744/5745/5746/5747/5752 to prod

.circleci/config.yml

@@ -12,7 +12,7 @@ orbs:
             default: false
 
         docker:
-          - image: python:3.9-slim-bullseye
+          - image: python:3.11-slim-bullseye
         working_directory: ~/repo
         resource_class: large
         steps:
@@ -23,9 +23,9 @@ orbs:
                 apt-get update && apt-get install --yes --no-install-recommends git curl
           - restore_cache:
               keys:
-                - v3.9-dependencies-{{ checksum "requirements.txt" }}
+                - v3.11-dependencies-{{ checksum "requirements.txt" }}
                 # fallback to using the latest cache if no exact match is found
-                - v3.9-dependencies-
+                - v3.11-dependencies-
 
           - run:
               name: install dependencies
@@ -91,7 +91,7 @@ orbs:
           - save_cache:
               paths:
                 - ./venv
-              key: v3.9-dependencies-{{ checksum "requirements.txt" }}
+              key: v3.11-dependencies-{{ checksum "requirements.txt" }}
 
           - run:
               name: Build image if needed
@@ -107,7 +107,7 @@ orbs:
 jobs:
   deploy:
     docker:
-      - image: python:3.9-slim-bullseye
+      - image: python:3.11-slim-bullseye
     working_directory: ~/repo
     steps:
       - run:
@@ -119,9 +119,9 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v3.9-dependencies-gcloud-457-{{ checksum "requirements.txt" }}
+            - v3.11-dependencies-gcloud-457-{{ checksum "requirements.txt" }}
             # fallback to using the latest cache if no exact match is found
-            - v3.9-dependencies-gcloud-457-
+            - v3.11-dependencies-gcloud-457-
 
       - run:
           name: install dependencies
@@ -146,7 +146,7 @@ jobs:
       - save_cache:
           paths:
             - ./venv
-          key: v3.9-dependencies-gcloud-457-{{ checksum "requirements.txt" }}
+          key: v3.11-dependencies-gcloud-457-{{ checksum "requirements.txt" }}
 
       - run:
           name: Authenticating with google service account for kms/sops
@@ -236,9 +236,9 @@ jobs:
           no_output_timeout: 30m
 
       - run:
-          name: Deploy dev-r
+          name: Deploy dev
           command: |
-            hubploy deploy --timeout 30m dev-r hub ${CIRCLE_BRANCH}
+            hubploy deploy --timeout 30m dev hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
       - run:
@@ -538,8 +538,8 @@ workflows:
           # This has no effect yet because docker-py doesn't support buildkit.
           #environment:
           #  DOCKER_BUILDKIT: 1
-          deployment: dev-r
-          name: dev-r image build
+          deployment: dev
+          name: dev image build
           filters:
               branches:
                 ignore:
@@ -701,8 +701,8 @@ workflows:
                 only:
                 - staging
       - hubploy/build-image:
-          deployment: dev-r
-          name: dev-r image build
+          deployment: dev
+          name: dev image build
           push: true
           # Filters can only be per-job? wtf
           filters:
@@ -805,7 +805,7 @@ workflows:
               - data101 image build
               - data102 image build
               - datahub image build
-              - dev-r image build
+              - dev image build
               - edx image build
               - eecs image build
               - ischool image build

.github/labeler.yml

@@ -101,8 +101,8 @@ node-placeholder-scaler:
   - 'deployments/datahub/**'
 'hub: dlab':
   - 'deployments/dlab/**'
-'hub: dev-r':
-  - 'deployments/dev-r/**'
+'hub: dev':
+  - 'deployments/dev/**'
 'hub: edx':
   - 'deployments/edx/**'
 'hub: eecs':

deployments/datahub/images/default/environment.yml

@@ -95,6 +95,11 @@ dependencies:
 # EPS 256, https://github.com/berkeley-dsep-infra/datahub/issues/1775
 - obspy==1.4.1
 
+# Install VSCode for ESPM courses - https://github.com/berkeley-dsep-infra/datahub/issues/5716
+- nodejs=16 # code-server requires node < 17
+- jupyter-vscode-proxy==0.5
+- code-server==4.10.1
+
 - pip:
   # - -r /tmp/infra-requirements.txt
   # Econ 148, Spring 2023 https://github.com/berkeley-dsep-infra/datahub/issues/4093

deployments/dev-r/config/common.yaml → deployments/dev/config/common.yaml

@@ -64,12 +64,12 @@ jupyterhub:
     defaultUrl: /rstudio
     profileList:
       - display_name: "Dockerfile image"
-        description: "This is the original dev-r image."
+        description: "This is the original dev image."
         default: true
       - display_name: "repo2docker image"
         description: "A newer repo2docker-based image with similar components as the primary."
         kubespawner_override:
-          image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-r-secondary:1a64e0a
+          image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary:1a64e0a
       - display_name: "1524699: DataHub Infrastructure"
         slug: "1524699"
         description: "Regular image with per-course subpath."

deployments/dev-r/config/prod.yaml → deployments/dev/config/prod.yaml

@@ -1,16 +1,16 @@
 nfsPVC:
   nfs:
-    shareName: shares/dev-r/prod
+    shareName: shares/dev/prod
 
 jupyterhub:
   ingress:
     enabled: true
     hosts:
-      - dev-r.datahub.berkeley.edu
+      - dev.datahub.berkeley.edu
     tls:
       - secretName: tls-cert
         hosts:
-          - dev-r.datahub.berkeley.edu
+          - dev.datahub.berkeley.edu
   hub:
     db:
       pvc:

deployments/dev-r/config/staging.yaml → deployments/dev/config/staging.yaml

@@ -1,6 +1,6 @@
 nfsPVC:
   nfs:
-    shareName: shares/dev-r/staging
+    shareName: shares/dev/staging
 
 jupyterhub:
   scheduling:
@@ -12,8 +12,8 @@ jupyterhub:
   ingress:
     enabled: true
     hosts:
-      - dev-r-staging.datahub.berkeley.edu
+      - dev-staging.datahub.berkeley.edu
     tls:
       - secretName: tls-cert
         hosts:
-          - dev-r-staging.datahub.berkeley.edu
+          - dev-staging.datahub.berkeley.edu

deployments/dev-r/hubploy.yaml → deployments/dev/hubploy.yaml

@@ -1,8 +1,8 @@
 images:
   images:
-    - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-r-user-image
+    - 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-r-secondary
+    - 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

requirements.txt

@@ -7,3 +7,4 @@ chartpress
 jupyter-repo2docker==2024.3.0
 myst-parser
 chardet
+requests==2.31.0

scripts/delete-unused-users.py

@@ -19,7 +19,7 @@
 import json
 import logging
 import os
-import requests
+import niquests
 import sys
 
 from dateutil.parser import parse
@@ -55,7 +55,7 @@ def retrieve_users(hub_url, headers, inactive_since):
     params = {}
 
     while next_page:
-        r = requests.get(url, headers=headers, params=params)
+        r = niquests.get(url, headers=headers, params=params)
         r.raise_for_status()
         resp = r.json()
         user_list = resp["items"]
@@ -104,7 +104,7 @@ def should_delete(user, inactive_since):
 
 def delete_user(hub_url, headers, name):
     """Delete a given user by name via JupyterHub API"""
-    r = requests.delete(
+    r = niquests.delete(
         hub_url.rstrip("/") + f"/hub/api/users/{name}",
         headers=headers,
     )