From 8b21162a888dc449681679e48d39763ed5d61897 Mon Sep 17 00:00:00 2001 From: James Munroe Date: Sat, 13 Apr 2024 10:41:16 -0400 Subject: [PATCH 1/2] [ucmerced] update images --- config/clusters/2i2c/ucmerced-staging.values.yaml | 4 ++-- config/clusters/2i2c/ucmerced.values.yaml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/clusters/2i2c/ucmerced-staging.values.yaml b/config/clusters/2i2c/ucmerced-staging.values.yaml index 19b3e8aea0..76a70ac0ef 100644 --- a/config/clusters/2i2c/ucmerced-staging.values.yaml +++ b/config/clusters/2i2c/ucmerced-staging.values.yaml @@ -12,8 +12,8 @@ jupyterhub: description: Start a Python server with JupyterLab and scientific Python stack default: true kubespawner_override: - # From https://github.com/2i2c-org/scipy-notebook-with-nbgitpuller - image: quay.io/2i2c/scipy-notebook-with-nbgitpuller:99968bfe6916 + # From https://github.com/SaiUCM/example-inherit-from-community-image + image: quay.io/cirt_ucm/jupyter-scipy-xarray:latest # Launch into JupyterLab after the user logs in default_url: /lab - display_name: R diff --git a/config/clusters/2i2c/ucmerced.values.yaml b/config/clusters/2i2c/ucmerced.values.yaml index e9ba657363..aad9a1b1f1 100644 --- a/config/clusters/2i2c/ucmerced.values.yaml +++ b/config/clusters/2i2c/ucmerced.values.yaml @@ -12,8 +12,9 @@ jupyterhub: description: Start a Python server with JupyterLab and scientific Python stack default: true kubespawner_override: - # From https://github.com/2i2c-org/scipy-notebook-with-nbgitpuller - image: quay.io/2i2c/scipy-notebook-with-nbgitpuller:99968bfe6916 + # From https://github.com/SaiUCM/example-inherit-from-community-image + # See https://2i2c.freshdesk.com/a/tickets/1407 + image: quay.io/cirt_ucm/jupyter-scipy-xarray:e490e37d1ef2 # Launch into JupyterLab after the user logs in default_url: /lab - display_name: R From 33d4fb3f37b646ebbe0b2a3eac330930d01482ad Mon Sep 17 00:00:00 2001 From: James Munroe Date: Mon, 15 Apr 2024 11:08:08 -0400 Subject: [PATCH 2/2] sciencecore: add SCHOOL specific profile --- config/clusters/opensci/sciencecore.values.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/clusters/opensci/sciencecore.values.yaml b/config/clusters/opensci/sciencecore.values.yaml index fe7d541feb..5d0ae3a60f 100644 --- a/config/clusters/opensci/sciencecore.values.yaml +++ b/config/clusters/opensci/sciencecore.values.yaml @@ -68,6 +68,15 @@ jupyterhub: kubespawner_override: # FIXME: use quay.io/ for tags after 2023-10-20 image: jupyter/scipy-notebook:2023-06-26 + school: + display_name: TOPST SCHOOL Project + description: "quay.io/repository/isciences/tops-school:latest" + slug: school + kubespawner_override: + image: quay.io/isciences/tops-school:latest + # Launch into RStudio after the user logs in + default_url: /rstudio + working_dir: /home/rstudio resources: display_name: Resource Allocation choices: