From e48f0d685589606994562e717d008ab04b64a9ae Mon Sep 17 00:00:00 2001 From: shane knapp Date: Wed, 12 Jun 2024 09:54:57 -0700 Subject: [PATCH 1/5] adding a placeholder for the dev pool --- node-placeholder/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node-placeholder/values.yaml b/node-placeholder/values.yaml index bb27bc699..ff0854a8b 100644 --- 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 From 702d2666339256753354ba66aa93176829399afc Mon Sep 17 00:00:00 2001 From: shane knapp Date: Wed, 12 Jun 2024 09:57:52 -0700 Subject: [PATCH 2/5] removing extra whitespace --- node-placeholder/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node-placeholder/values.yaml b/node-placeholder/values.yaml index ff0854a8b..f6760f10b 100644 --- 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: 1 + replicas: 1 dlab: nodeSelector: hub.jupyter.org/pool-name: dlab-pool From 51031a6ca5dfaa55b9dd891016768d4d05f7eb63 Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Wed, 12 Jun 2024 15:53:30 -0700 Subject: [PATCH 3/5] Fixing the image tag in dev hub --- deployments/dev/config/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/dev/config/common.yaml b/deployments/dev/config/common.yaml index 46bc8d6b3..2d1ab9cea 100644 --- a/deployments/dev/config/common.yaml +++ b/deployments/dev/config/common.yaml @@ -70,7 +70,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: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." From 259ae1293dcb9d43f0566a0de64559e62f9027ec Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Wed, 12 Jun 2024 16:00:02 -0700 Subject: [PATCH 4/5] Default to lab environment --- deployments/dev/config/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/dev/config/common.yaml b/deployments/dev/config/common.yaml index 2d1ab9cea..c8c081302 100644 --- a/deployments/dev/config/common.yaml +++ b/deployments/dev/config/common.yaml @@ -62,7 +62,7 @@ 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." From 0ecb942f1a014a15ae7fd8c24b896bb4a9e05155 Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Fri, 14 Jun 2024 14:45:32 -0700 Subject: [PATCH 5/5] [DH-313] removing external ip from datahub-prod --- deployments/datahub/config/common.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml index 8833165e1..5683e39bc 100644 --- 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.