Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DH-313] Merging #5795, #5798, #5800 to prod #5801

Merged
merged 8 commits into from
Jun 14, 2024
Merged

[DH-313] Merging #5795, #5798, #5800 to prod #5801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e48f0d6
adding a placeholder for the dev pool
shaneknapp Jun 12, 2024
702d266
removing extra whitespace
shaneknapp Jun 12, 2024
7e4371a
Merge pull request #5795 from shaneknapp/placeholder-dev
shaneknapp Jun 12, 2024
51031a6
Fixing the image tag in dev hub
balajialg Jun 12, 2024
259ae12
Default to lab environment
balajialg Jun 12, 2024
9cf8b55
Merge pull request #5798 from balajialg/dev_config
balajialg Jun 13, 2024
0ecb942
[DH-313] removing external ip from datahub-prod
felder Jun 14, 2024
0c55eb4
Merge pull request #5800 from felder/felder_DH-313
felder Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions deployments/datahub/config/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions deployments/dev/config/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion node-placeholder/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading