diff --git a/deployments/a11y/config/common.yaml b/deployments/a11y/config/common.yaml index 7e4bc6c8b..dedbd1dd7 100644 --- a/deployments/a11y/config/common.yaml +++ b/deployments/a11y/config/common.yaml @@ -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 diff --git a/deployments/a11y/hubploy.yaml b/deployments/a11y/hubploy.yaml index 1ecbda9cd..1815bec43 100644 --- a/deployments/a11y/hubploy.yaml +++ b/deployments/a11y/hubploy.yaml @@ -15,5 +15,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/astro/config/common.yaml b/deployments/astro/config/common.yaml index 2148b06ac..30ed02207 100644 --- a/deployments/astro/config/common.yaml +++ b/deployments/astro/config/common.yaml @@ -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 diff --git a/deployments/astro/hubploy.yaml b/deployments/astro/hubploy.yaml index 12f4123b7..43bb0b893 100644 --- a/deployments/astro/hubploy.yaml +++ b/deployments/astro/hubploy.yaml @@ -11,5 +11,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/biology/config/common.yaml b/deployments/biology/config/common.yaml index d5a8c35a9..57fd5717a 100644 --- a/deployments/biology/config/common.yaml +++ b/deployments/biology/config/common.yaml @@ -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: diff --git a/deployments/biology/hubploy.yaml b/deployments/biology/hubploy.yaml index f6f546723..26ef5b965 100644 --- a/deployments/biology/hubploy.yaml +++ b/deployments/biology/hubploy.yaml @@ -11,5 +11,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/cee/config/common.yaml b/deployments/cee/config/common.yaml index 41fe62113..c51d92fbc 100644 --- a/deployments/cee/config/common.yaml +++ b/deployments/cee/config/common.yaml @@ -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 diff --git a/deployments/cee/hubploy.yaml b/deployments/cee/hubploy.yaml index c4d9af2c9..ae88ce005 100644 --- a/deployments/cee/hubploy.yaml +++ b/deployments/cee/hubploy.yaml @@ -13,5 +13,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml index bec4b4776..c7a55caf0 100644 --- a/deployments/data100/config/common.yaml +++ b/deployments/data100/config/common.yaml @@ -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 diff --git a/deployments/data100/hubploy.yaml b/deployments/data100/hubploy.yaml index 10cb00c1f..81d8ff67c 100644 --- a/deployments/data100/hubploy.yaml +++ b/deployments/data100/hubploy.yaml @@ -15,5 +15,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/data101/config/common.yaml b/deployments/data101/config/common.yaml index 6ea15fe54..407ffccc8 100644 --- a/deployments/data101/config/common.yaml +++ b/deployments/data101/config/common.yaml @@ -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: @@ -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: @@ -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 diff --git a/deployments/data101/hubploy.yaml b/deployments/data101/hubploy.yaml index ad832d998..f117bbf87 100644 --- a/deployments/data101/hubploy.yaml +++ b/deployments/data101/hubploy.yaml @@ -16,5 +16,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/data102/config/common.yaml b/deployments/data102/config/common.yaml index d2950d8ad..9cb12e4fe 100644 --- a/deployments/data102/config/common.yaml +++ b/deployments/data102/config/common.yaml @@ -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 diff --git a/deployments/data102/hubploy.yaml b/deployments/data102/hubploy.yaml index 795a441aa..aea158393 100644 --- a/deployments/data102/hubploy.yaml +++ b/deployments/data102/hubploy.yaml @@ -16,5 +16,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/data8/config/common.yaml b/deployments/data8/config/common.yaml index 5dbea7baa..e109e12a8 100644 --- a/deployments/data8/config/common.yaml +++ b/deployments/data8/config/common.yaml @@ -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 diff --git a/deployments/data8/hubploy.yaml b/deployments/data8/hubploy.yaml index 811cbd30c..94b82ca7d 100644 --- a/deployments/data8/hubploy.yaml +++ b/deployments/data8/hubploy.yaml @@ -15,5 +15,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml index 93f5b0214..6492e68b6 100644 --- a/deployments/datahub/config/common.yaml +++ b/deployments/datahub/config/common.yaml @@ -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: @@ -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 @@ -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: diff --git a/deployments/datahub/config/prod.yaml b/deployments/datahub/config/prod.yaml index 2755d7a84..65e9101f3 100644 --- a/deployments/datahub/config/prod.yaml +++ b/deployments/datahub/config/prod.yaml @@ -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: diff --git a/deployments/datahub/hubploy.yaml b/deployments/datahub/hubploy.yaml index e4faa9da0..31a953111 100644 --- a/deployments/datahub/hubploy.yaml +++ b/deployments/datahub/hubploy.yaml @@ -13,5 +13,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 - zone: us-central1 \ No newline at end of file + cluster: spring-2024 + zone: us-central1 diff --git a/deployments/dev-r/config/common.yaml b/deployments/dev-r/config/common.yaml index 54a1a782e..0d180181d 100644 --- a/deployments/dev-r/config/common.yaml +++ b/deployments/dev-r/config/common.yaml @@ -7,11 +7,11 @@ 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 @@ -19,7 +19,7 @@ jupyterhub: 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: diff --git a/deployments/dev-r/hubploy.yaml b/deployments/dev-r/hubploy.yaml index e2bdc59a2..ba6a74b59 100644 --- a/deployments/dev-r/hubploy.yaml +++ b/deployments/dev-r/hubploy.yaml @@ -17,5 +17,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/dlab/config/common.yaml b/deployments/dlab/config/common.yaml index ef3269cce..cd9cd5bb6 100644 --- a/deployments/dlab/config/common.yaml +++ b/deployments/dlab/config/common.yaml @@ -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 diff --git a/deployments/dlab/hubploy.yaml b/deployments/dlab/hubploy.yaml index 0d62ce26b..a82066120 100644 --- a/deployments/dlab/hubploy.yaml +++ b/deployments/dlab/hubploy.yaml @@ -13,5 +13,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/eecs/config/common.yaml b/deployments/eecs/config/common.yaml index c7a46caa7..e83c1d125 100644 --- a/deployments/eecs/config/common.yaml +++ b/deployments/eecs/config/common.yaml @@ -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: diff --git a/deployments/eecs/hubploy.yaml b/deployments/eecs/hubploy.yaml index a646be5b9..92d8d6243 100644 --- a/deployments/eecs/hubploy.yaml +++ b/deployments/eecs/hubploy.yaml @@ -15,5 +15,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/gradebook/config/common.yaml b/deployments/gradebook/config/common.yaml index ae07ec97a..ae3eb2266 100644 --- a/deployments/gradebook/config/common.yaml +++ b/deployments/gradebook/config/common.yaml @@ -7,11 +7,11 @@ 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: extraConfig: @@ -28,7 +28,7 @@ jupyterhub: c.KubeSpawner.working_dir = '/home/rstudio' 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 diff --git a/deployments/gradebook/hubploy.yaml b/deployments/gradebook/hubploy.yaml index b789d02f0..4891ccd7d 100644 --- a/deployments/gradebook/hubploy.yaml +++ b/deployments/gradebook/hubploy.yaml @@ -13,5 +13,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/highschool/config/common.yaml b/deployments/highschool/config/common.yaml index ce3ce30e7..0d4c5f4e4 100644 --- a/deployments/highschool/config/common.yaml +++ b/deployments/highschool/config/common.yaml @@ -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: Authenticator: enable_auth_state: false diff --git a/deployments/highschool/hubploy.yaml b/deployments/highschool/hubploy.yaml index 0d62ce26b..a82066120 100644 --- a/deployments/highschool/hubploy.yaml +++ b/deployments/highschool/hubploy.yaml @@ -13,5 +13,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/ischool/config/common.yaml b/deployments/ischool/config/common.yaml index 04832a205..fc0c27bcd 100644 --- a/deployments/ischool/config/common.yaml +++ b/deployments/ischool/config/common.yaml @@ -7,11 +7,11 @@ 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: extraConfig: @@ -27,7 +27,7 @@ jupyterhub: # consistently. c.KubeSpawner.working_dir = '/home/rstudio' 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 diff --git a/deployments/ischool/hubploy.yaml b/deployments/ischool/hubploy.yaml index 5ad66b250..9e7582c88 100644 --- a/deployments/ischool/hubploy.yaml +++ b/deployments/ischool/hubploy.yaml @@ -13,5 +13,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/julia/config/common.yaml b/deployments/julia/config/common.yaml index 661a09d4a..bbfaf31da 100644 --- a/deployments/julia/config/common.yaml +++ b/deployments/julia/config/common.yaml @@ -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 diff --git a/deployments/julia/hubploy.yaml b/deployments/julia/hubploy.yaml index 4e3223796..d93ba8880 100644 --- a/deployments/julia/hubploy.yaml +++ b/deployments/julia/hubploy.yaml @@ -11,5 +11,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/logodev/config/common.yaml b/deployments/logodev/config/common.yaml index 5c8274bb8..8391c199d 100644 --- a/deployments/logodev/config/common.yaml +++ b/deployments/logodev/config/common.yaml @@ -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 diff --git a/deployments/logodev/config/cookiecutter.json b/deployments/logodev/config/cookiecutter.json index 283c0f197..005eab59f 100644 --- a/deployments/logodev/config/cookiecutter.json +++ b/deployments/logodev/config/cookiecutter.json @@ -1,7 +1,7 @@ { "hub_name": "logodev", "project_name": "ucb-datahub-2018", - "cluster_name": "fall-2019", + "cluster_name": "spring-2024", "pool_name": "user-logodev-2023-04-11", "hub_filestore_share": "shares", "hub_filestore_ip": "10.185.238.42", diff --git a/deployments/logodev/hubploy.yaml b/deployments/logodev/hubploy.yaml index 0d62ce26b..a82066120 100644 --- a/deployments/logodev/hubploy.yaml +++ b/deployments/logodev/hubploy.yaml @@ -13,5 +13,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/prob140/config/common.yaml b/deployments/prob140/config/common.yaml index d48660ca8..453827693 100644 --- a/deployments/prob140/config/common.yaml +++ b/deployments/prob140/config/common.yaml @@ -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 traefik: nodeSelector: - hub.jupyter.org/pool-name: core-pool-2023-12-21 + hub.jupyter.org/pool-name: core-pool-2024-05-08 hub: config: @@ -64,7 +64,7 @@ jupyterhub: # - course::1533557::enrollment_type::ta nodeSelector: - hub.jupyter.org/pool-name: core-pool-2023-12-21 + hub.jupyter.org/pool-name: core-pool-2024-05-08 singleuser: extraFiles: diff --git a/deployments/prob140/hubploy.yaml b/deployments/prob140/hubploy.yaml index 0d62ce26b..a82066120 100644 --- a/deployments/prob140/hubploy.yaml +++ b/deployments/prob140/hubploy.yaml @@ -13,5 +13,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/publichealth/config/common.yaml b/deployments/publichealth/config/common.yaml index aba2e5e97..4b8195e8a 100644 --- a/deployments/publichealth/config/common.yaml +++ b/deployments/publichealth/config/common.yaml @@ -14,11 +14,11 @@ 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: loadRoles: @@ -65,7 +65,7 @@ jupyterhub: # consistently. c.KubeSpawner.working_dir = '/home/rstudio' nodeSelector: - hub.jupyter.org/pool-name: core-pool-2023-12-21 + hub.jupyter.org/pool-name: core-pool-2024-05-08 singleuser: extraFiles: diff --git a/deployments/publichealth/hubploy.yaml b/deployments/publichealth/hubploy.yaml index e7a75bafc..fd6bb6108 100644 --- a/deployments/publichealth/hubploy.yaml +++ b/deployments/publichealth/hubploy.yaml @@ -13,5 +13,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/r/config/common.yaml b/deployments/r/config/common.yaml index bb2d40937..c1de043a7 100644 --- a/deployments/r/config/common.yaml +++ b/deployments/r/config/common.yaml @@ -14,19 +14,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: service: type: ClusterIP 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 diff --git a/deployments/r/hubploy.yaml b/deployments/r/hubploy.yaml index 0d62ce26b..a82066120 100644 --- a/deployments/r/hubploy.yaml +++ b/deployments/r/hubploy.yaml @@ -13,5 +13,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/shiny/config/common.yaml b/deployments/shiny/config/common.yaml index 31e67808d..ce4686976 100644 --- a/deployments/shiny/config/common.yaml +++ b/deployments/shiny/config/common.yaml @@ -7,11 +7,11 @@ 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: extraConfig: @@ -27,7 +27,7 @@ jupyterhub: # consistently. c.KubeSpawner.working_dir = '/home/rstudio' 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 diff --git a/deployments/shiny/hubploy.yaml b/deployments/shiny/hubploy.yaml index 8d11896eb..9b00330b6 100644 --- a/deployments/shiny/hubploy.yaml +++ b/deployments/shiny/hubploy.yaml @@ -13,5 +13,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/stat159/config/common.yaml b/deployments/stat159/config/common.yaml index 32566b784..a64cf45d8 100644 --- a/deployments/stat159/config/common.yaml +++ b/deployments/stat159/config/common.yaml @@ -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 diff --git a/deployments/stat159/hubploy.yaml b/deployments/stat159/hubploy.yaml index 26fc63fcb..87d309ad5 100644 --- a/deployments/stat159/hubploy.yaml +++ b/deployments/stat159/hubploy.yaml @@ -15,5 +15,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/stat20/config/common.yaml b/deployments/stat20/config/common.yaml index b10b26eec..9d153f32f 100644 --- a/deployments/stat20/config/common.yaml +++ b/deployments/stat20/config/common.yaml @@ -7,11 +7,11 @@ 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: extraConfig: @@ -27,7 +27,7 @@ jupyterhub: # consistently. c.KubeSpawner.working_dir = '/home/rstudio' 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 diff --git a/deployments/stat20/hubploy.yaml b/deployments/stat20/hubploy.yaml index d244e7e63..dd982a4a7 100644 --- a/deployments/stat20/hubploy.yaml +++ b/deployments/stat20/hubploy.yaml @@ -11,5 +11,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 diff --git a/deployments/template/cookiecutter.json b/deployments/template/cookiecutter.json index cec344d31..b19901c0c 100644 --- a/deployments/template/cookiecutter.json +++ b/deployments/template/cookiecutter.json @@ -1,7 +1,7 @@ { "hub_name": "dns-valid-hub-name", "project_name": "ucb-datahub-2018", - "cluster_name": "fall-2019", + "cluster_name": "spring-2024", "pool_name": "name-of-the-pool", "hub_filestore_share": "shares", "hub_filestore_ip": "ip-address-of-fileshare-instance", diff --git a/deployments/template/{{cookiecutter.hub_name}}/config/common.yaml b/deployments/template/{{cookiecutter.hub_name}}/config/common.yaml index f5fb27110..a2ef9d586 100644 --- a/deployments/template/{{cookiecutter.hub_name}}/config/common.yaml +++ b/deployments/template/{{cookiecutter.hub_name}}/config/common.yaml @@ -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 diff --git a/deployments/workshop/config/common.yaml b/deployments/workshop/config/common.yaml index 732c2c9f9..4e2d7721b 100644 --- a/deployments/workshop/config/common.yaml +++ b/deployments/workshop/config/common.yaml @@ -17,12 +17,12 @@ 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: # No more than 200 users at any given time activeServerLimit: 200 nodeSelector: - hub.jupyter.org/pool-name: core-pool-2023-12-21 + hub.jupyter.org/pool-name: core-pool-2024-05-08 config: JupyterHub: admin_access: false @@ -30,10 +30,10 @@ jupyterhub: 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 singleuser: extraEnv: # Unset NotebookApp from hub/values. Necessary for recent lab versions. diff --git a/deployments/workshop/hubploy.yaml b/deployments/workshop/hubploy.yaml index 36b8f6c6e..e50579cde 100644 --- a/deployments/workshop/hubploy.yaml +++ b/deployments/workshop/hubploy.yaml @@ -13,5 +13,5 @@ cluster: gcloud: project: ucb-datahub-2018 service_key: gke-key.json - cluster: fall-2019 + cluster: spring-2024 zone: us-central1 \ No newline at end of file diff --git a/support/requirements.yaml b/support/requirements.yaml index f15c30488..688f6d40e 100644 --- a/support/requirements.yaml +++ b/support/requirements.yaml @@ -9,7 +9,7 @@ dependencies: version: 6.57.4 repository: https://grafana.github.io/helm-charts - name: cert-manager - version: v1.13.3 + version: v1.14.5 repository: https://charts.jetstack.io - name: ingress-nginx version: 4.8.3 diff --git a/support/values.yaml b/support/values.yaml index 297d0c8b3..cb80ae8e4 100644 --- a/support/values.yaml +++ b/support/values.yaml @@ -32,7 +32,7 @@ ingress-nginx: # Best effort guess on resource needs # We overprovision a little - issues here cause a full cluster outage nodeSelector: - hub.jupyter.org/pool-name: core-pool-2023-12-21 + hub.jupyter.org/pool-name: core-pool-2024-05-08 replicaCount: 3 resources: limits: @@ -42,7 +42,8 @@ ingress-nginx: cpu: 0.2 memory: 384Mi service: - loadBalancerIP: 34.69.164.86 + # this IP is the wildcard DNS record for datahub.b.e + loadBalancerIP: 35.184.243.160 metrics: enabled: true podAnnotations: