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

[DH-313] Merging #5795, #5798, #5800 to prod
berkeley-dsep-infra · Jun 14, 2024 · 8faf238 · 8faf238
2 parents 5642350 + 0c55eb4
commit 8faf238
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml
@@ -73,14 +73,9 @@ jupyterhub:
         c.JupyterHub.template_paths = ['/usr/local/share/jupyterhub/custom_templates/']
 
   proxy:
-    service:
-      type: LoadBalancer
     chp:
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
-    traefik:
-      nodeSelector:
-        hub.jupyter.org/pool-name: core-pool-2024-05-08
   singleuser:
     extraEnv:
       # Unset NotebookApp from hub/values. Necessary for recent lab versions.

diff --git a/deployments/dev/config/common.yaml b/deployments/dev/config/common.yaml
@@ -62,15 +62,15 @@ jupyterhub:
     extraEnv:
       # Unset NotebookApp from hub/values. Necessary for recent lab versions.
       JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"
-    defaultUrl: /rstudio
+    defaultUrl: /lab
     profileList:
       - display_name: "Dockerfile image"
         description: "This is the original dev image."
         default: true
       - 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:1a64e0a
+          image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary:36280727a
       - display_name: "1524699: DataHub Infrastructure"
         slug: "1524699"
         description: "Regular image with per-course subpath."

diff --git a/node-placeholder/values.yaml b/node-placeholder/values.yaml
@@ -142,7 +142,7 @@ nodePools:
       requests:
         # Some value slightly lower than allocatable RAM on the nodepool
         memory: 29247442944
-    replicas: 0
+    replicas: 1
   dlab:
     nodeSelector:
       hub.jupyter.org/pool-name: dlab-pool