[pull] master from 2i2c-org:master

config/clusters/2i2c-aws-us/support.values.yaml

@@ -27,9 +27,7 @@ prometheus:
           hosts:
             - prometheus.aws.2i2c.cloud
     persistentVolume:
-      # Found to be out of space with at 100Gi disk at 2023-07-31, when it was
-      # increased to 250Gi.
-      size: 250Gi
+      size: 500Gi
 
 cluster-autoscaler:
   enabled: true

config/clusters/2i2c/imagebuilding-demo.values.yaml

@@ -44,10 +44,12 @@ jupyterhub:
             choices:
               pangeo:
                 display_name: Pangeo Notebook Image
+                description: "Python image with scientific, dask and geospatial tools"
                 kubespawner_override:
                   image: pangeo/pangeo-notebook:2023.09.11
               geospatial:
                 display_name: Rocker Geospatial
+                description: "R image with RStudio, the tidyverse & Geospatial tools"
                 default: true
                 slug: geospatial
                 kubespawner_override:
@@ -78,6 +80,7 @@ jupyterhub:
             choices:
               mem_2_7:
                 display_name: 2.7 GB RAM, upto 3.479 CPUs
+                description: "Use this for the workshop on 2023 September"
                 kubespawner_override:
                   mem_guarantee: 2904451072
                   mem_limit: 2904451072
@@ -106,6 +109,7 @@ jupyterhub:
                     node.kubernetes.io/instance-type: n1-highmem-4
               mem_21_6:
                 display_name: 21.6 GB RAM, upto 3.479 CPUs
+                description: "Largest amount of RAM, might take a few minutes to start"
                 kubespawner_override:
                   mem_guarantee: 23235608576
                   mem_limit: 23235608576
@@ -121,7 +125,7 @@ jupyterhub:
         url: http://imagebuilding-demo-binderhub-service:8090
     image:
       name: quay.io/2i2c/dynamic-image-building-experiment
-      tag: "0.0.1-0.dev.git.7029.h44cd314e"
+      tag: "0.0.1-0.dev.git.7067.hdae5e902"
     config:
       JupyterHub:
         authenticator_class: github
@@ -134,12 +138,9 @@ jupyterhub:
           - read:org
 
     extraConfig:
-      enable-prototype-UI: |
-        from kubespawner_dynamic_building_ui import TEMPLATE_PATHS, STATIC_HANDLER_TUPLE
-        c.KubeSpawner.additional_profile_form_template_paths = TEMPLATE_PATHS
-
-        # Add extra handler to serve JS & CSS assets
-        c.JupyterHub.extra_handlers.append(STATIC_HANDLER_TUPLE)
+      enable-fancy-profiles: |
+        from jupyterhub_fancy_profiles import setup_ui
+        setup_ui(c)
 
 binderhub-service:
   nodeSelector:

config/clusters/2i2c/temple.values.yaml

@@ -25,6 +25,14 @@ jupyterhub:
         funded_by:
           name: Temple University
           url: https://www.temple.edu/
+  singleuser:
+    nodeSelector:
+      2i2c.org/community: temple
+    extraTolerations:
+      - key: "2i2c.org/community"
+        operator: "Equal"
+        value: "temple"
+        effect: "NoSchedule"
   hub:
     config:
       Authenticator:

config/clusters/cloudbank/ccsf.values.yaml

@@ -42,7 +42,6 @@ jupyterhub:
           http://google.com/accounts/o8/id:
             username_derivation:
               username_claim: "email"
-            allowed_domains: ["2i2c.org", "berkeley.edu", "mail.ccsf.edu"]
           urn:mace:incommon:berkeley.edu:
             username_derivation:
               username_claim: "email"
@@ -54,6 +53,7 @@ jupyterhub:
           - [email protected]
           - [email protected]
           - [email protected]
+        username_pattern: '^(.+@2i2c\.org|.+@berkeley\.edu|.+@mail\.ccsf\.edu|clare\.alice\.heimer@gmail\.com|deployment-service-check)$'
     extraFiles:
       configurator-schema-default:
         data:

config/clusters/cloudbank/demo.values.yaml

@@ -59,7 +59,7 @@ jupyterhub:
         # Protects against cryptominers - https://github.com/2i2c-org/infrastructure/issues/1216
         # FIXME: This doesn't account for educational institutions that have emails that don't end in .edu,
         # as is the case for some non-euroamerican universities.
-        username_pattern: '^(.+@2i2c\.org|.+\.edu|kalkeab@gmail\.com|[email protected]|deployment-service-check)$'
+        username_pattern: '^(.+@2i2c\.org|.+\.edu|kalkeab@gmail\.com|jhenryestrada@gmail\.com|deployment-service-check)$'
   cull:
     # Cull after 30min of inactivity
     every: 300

config/clusters/cloudbank/srjc.values.yaml

@@ -51,4 +51,4 @@ jupyterhub:
           - [email protected]
           - [email protected]
           - [email protected]
-        username_pattern: '^(.+@2i2c\.org|.+@berkeley\.edu|.+@santarosa\.edu|[email protected]|deployment-service-check)$'
+        username_pattern: '^(.+@2i2c\.org|.+@berkeley\.edu|.+@santarosa\.edu|mjmckeever496@gmail\.com|deployment-service-check)$'

config/clusters/hhmi/common.values.yaml

@@ -26,8 +26,9 @@ basehub:
             name: 2i2c
             url: https://2i2c.org
           funded_by:
-            name: TODO
-            url: https://www.hhmi.org/
+            name: ""
+            url: ""
+            custom_html: <a href="https://www.hhmi.org/">HHMI</a> and <a href="https://strategiesos.org/about/">Stratos</a>
     singleuser:
       image:
         name: pangeo/pangeo-notebook

config/clusters/nasa-veda/common.values.yaml

@@ -45,11 +45,13 @@ basehub:
             - rezuma
             - ranchodeluxe
             - jsignell
+            - slesaad
         JupyterHub:
           authenticator_class: github
         GitHubOAuthenticator:
           allowed_organizations:
             - veda-analytics-access:all-users
+            - veda-analytics-access:collaborator-access
             - 2i2c-org:hub-access-for-2i2c-staff
             - CYGNSS-VEDA:cygnss-iwg
           scope:

helm-charts/images/hub/dynamic-image-building-requirements.txt

@@ -1,6 +1,7 @@
 # Image lives at quay.io/2i2c/second-hub-experimental
 git+https://github.com/yuvipanda/jupyterhub-configurator@ed7e3a0df1e3d625d10903ef7d7fd9c2fbb548db
 # Brings on using `unlisted_choice` in profile options per https://github.com/2i2c-org/infrastructure/issues/2146
-git+https://github.com/jupyterhub/kubespawner@9663b7e0f0d3942962c99a39c375358f19e0718e
-# Brings in https://github.com/yuvipanda/prototype-kubespawner-dynamic-building-ui
-git+https://github.com/yuvipanda/prototype-kubespawner-dynamic-building-ui.git@19aa3685069894aa8e8236b9865795cd17994f8f
+# Brings in https://github.com/jupyterhub/kubespawner/pull/787
+git+https://github.com/jupyterhub/kubespawner@d60146f5fe9cd31e09acf13c377d9334ecf59c9b
+# Brings in https://github.com/yuvipanda/jupyterhub-fancy-profiles
+git+https://github.com/yuvipanda/jupyterhub-fancy-profiles@b624031b661f71a278a37bb1fae0b8d6f316d6b3

terraform/gcp/projects/pilot-hubs.tfvars

@@ -58,6 +58,27 @@ notebook_nodes = {
       "community" : "neurohackademy"
     },
   }
+  # Nodepool for temple university. https://github.com/2i2c-org/infrastructure/issues/3158
+  "temple" : {
+    # Expecting upto ~120 users at a time
+    min : 0,
+    max : 100,
+    # Everyone gets a 256M guarantee, and n2-highmem-8 has about 60GB of RAM.
+    # This fits upto 100 users on the node, as memory guarantee isn't the constraint.
+    # This works ok.
+    machine_type : "n2-highmem-8",
+    labels : {
+      "2i2c.org/community" : "temple"
+    },
+    taints : [{
+      key : "2i2c.org/community",
+      value : "temple",
+      effect : "NO_SCHEDULE"
+    }],
+    resource_labels : {
+      "community" : "temple"
+    },
+  }
 }
 
 # Setup a single node pool for dask workers.