Skip to content

Commit

Permalink
Merge pull request #5727 from shaneknapp/move-to-new-cluster
Browse files Browse the repository at this point in the history 
[DH-276] all hubs and infra to new cluster
  • Loading branch information
@shaneknapp
shaneknapp authored May 15, 2024
2 parents c898c4f + c2ee9af commit c9418f2
Show file tree
Hide file tree
Showing 54 changed files with 133 additions and 120 deletions.
6 changes: 3 additions & 3 deletions deployments/a11y/config/common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ jupyterhub:
scheduling:
userScheduler:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
proxy:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08

hub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
config:
loadRoles:
# datahub staff
Expand Down
2 changes: 1 addition & 1 deletion deployments/a11y/hubploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ cluster:
gcloud:
project: ucb-datahub-2018
service_key: gke-key.json
cluster: fall-2019
cluster: spring-2024
zone: us-central1
6 changes: 3 additions & 3 deletions deployments/astro/config/common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ jupyterhub:
scheduling:
userScheduler:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
proxy:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08

hub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
config:
loadRoles:
# datahub staff
Expand Down
2 changes: 1 addition & 1 deletion deployments/astro/hubploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ cluster:
gcloud:
project: ucb-datahub-2018
service_key: gke-key.json
cluster: fall-2019
cluster: spring-2024
zone: us-central1
8 changes: 4 additions & 4 deletions deployments/biology/config/common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ jupyterhub:
scheduling:
userScheduler:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
proxy:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
traefik:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08

hub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08

config:
loadRoles:
Expand Down
2 changes: 1 addition & 1 deletion deployments/biology/hubploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ cluster:
gcloud:
project: ucb-datahub-2018
service_key: gke-key.json
cluster: fall-2019
cluster: spring-2024
zone: us-central1
6 changes: 3 additions & 3 deletions deployments/cee/config/common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ jupyterhub:
scheduling:
userScheduler:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
proxy:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08

hub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
config:
loadRoles:
# datahub staff
Expand Down
2 changes: 1 addition & 1 deletion deployments/cee/hubploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ cluster:
gcloud:
project: ucb-datahub-2018
service_key: gke-key.json
cluster: fall-2019
cluster: spring-2024
zone: us-central1
6 changes: 3 additions & 3 deletions deployments/data100/config/common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ jupyterhub:
scheduling:
userScheduler:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
proxy:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
hub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
config:
loadRoles:
# datahub staff
Expand Down
2 changes: 1 addition & 1 deletion deployments/data100/hubploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ cluster:
gcloud:
project: ucb-datahub-2018
service_key: gke-key.json
cluster: fall-2019
cluster: spring-2024
zone: us-central1
6 changes: 3 additions & 3 deletions deployments/data101/config/common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jupyterhub:
scheduling:
userScheduler:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
prePuller:
extraImages:
postgres:
Expand All @@ -16,7 +16,7 @@ jupyterhub:
proxy:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08

hub:
config:
Expand Down Expand Up @@ -90,7 +90,7 @@ jupyterhub:
)
c.Spawner.pre_spawn_hook = ensure_db_pvc
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
config:
loadRoles:
# Data 101, SP 2024, #5508
Expand Down
2 changes: 1 addition & 1 deletion deployments/data101/hubploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ cluster:
gcloud:
project: ucb-datahub-2018
service_key: gke-key.json
cluster: fall-2019
cluster: spring-2024
zone: us-central1
8 changes: 4 additions & 4 deletions deployments/data102/config/common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ jupyterhub:
scheduling:
userScheduler:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
proxy:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
traefik:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
hub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
config:
loadRoles:
# datahub staff
Expand Down
2 changes: 1 addition & 1 deletion deployments/data102/hubploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ cluster:
gcloud:
project: ucb-datahub-2018
service_key: gke-key.json
cluster: fall-2019
cluster: spring-2024
zone: us-central1
8 changes: 4 additions & 4 deletions deployments/data8/config/common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ jupyterhub:
scheduling:
userScheduler:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
proxy:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
traefik:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08

hub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
config:
loadRoles:
# datahub staff
Expand Down
2 changes: 1 addition & 1 deletion deployments/data8/hubploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ cluster:
gcloud:
project: ucb-datahub-2018
service_key: gke-key.json
cluster: fall-2019
cluster: spring-2024
zone: us-central1
8 changes: 4 additions & 4 deletions deployments/datahub/config/common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jupyterhub:
scheduling:
userScheduler:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
hub:
config:
Authenticator:
Expand All @@ -37,7 +37,7 @@ jupyterhub:
- course::1524699::group::all-admins

nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
initContainers:
# There's another sidecar, specified in `secrets/staging.yaml` and `secrets/prod.yaml`
# that keeps this up to date. https://github.com/jupyterhub/kubespawner/issues/468
Expand Down Expand Up @@ -77,10 +77,10 @@ jupyterhub:
type: LoadBalancer
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
traefik:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
singleuser:
extraFiles:
remove-exporters:
Expand Down
20 changes: 16 additions & 4 deletions deployments/datahub/config/prod.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,24 @@ nfsPVC:
shareName: shares/datahub/prod

jupyterhub:
ingress:
enabled: true
hosts:
- prod.datahub.berkeley.edu
- datahub.berkeley.edu
tls:
- secretName: tls-cert
hosts:
- prod.datahub.berkeley.edu
- datahub.berkeley.edu
proxy:
service:
loadBalancerIP: 35.232.190.188
#service:
# this IP is the A record for datahub.b.e
#loadBalancerIP: 35.202.143.236
https:
hosts:
- datahub.berkeley.edu
enabled: false
#hosts:
# - datahub.berkeley.edu
hub:
db:
pvc:
Expand Down
4 changes: 2 additions & 2 deletions deployments/datahub/hubploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ cluster:
gcloud:
project: ucb-datahub-2018
service_key: gke-key.json
cluster: fall-2019
zone: us-central1
cluster: spring-2024
zone: us-central1
6 changes: 3 additions & 3 deletions deployments/dev-r/config/common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ jupyterhub:
scheduling:
userScheduler:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
proxy:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08

cull:
removeNamedServers: true

hub:
allowNamedServers: true
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
config:

extraConfig:
Expand Down
2 changes: 1 addition & 1 deletion deployments/dev-r/hubploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ cluster:
gcloud:
project: ucb-datahub-2018
service_key: gke-key.json
cluster: fall-2019
cluster: spring-2024
zone: us-central1
8 changes: 4 additions & 4 deletions deployments/dlab/config/common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ jupyterhub:
scheduling:
userScheduler:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
proxy:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
traefik:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08

hub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
config:
loadRoles:
# datahub staff
Expand Down
2 changes: 1 addition & 1 deletion deployments/dlab/hubploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ cluster:
gcloud:
project: ucb-datahub-2018
service_key: gke-key.json
cluster: fall-2019
cluster: spring-2024
zone: us-central1
8 changes: 4 additions & 4 deletions deployments/eecs/config/common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ jupyterhub:
scheduling:
userScheduler:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
proxy:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
traefik:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08

hub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2023-12-21
hub.jupyter.org/pool-name: core-pool-2024-05-08
config:
loadRoles:

Expand Down
2 changes: 1 addition & 1 deletion deployments/eecs/hubploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ cluster:
gcloud:
project: ucb-datahub-2018
service_key: gke-key.json
cluster: fall-2019
cluster: spring-2024
zone: us-central1
Loading

0 comments on commit c9418f2

Please sign in to comment.