Merge pull request #6271 from lsst-sqre/t/DM-54465

DM-54465: Update to Nublado 12.1.0

Author: rra

applications/nublado/Chart.yaml

@@ -5,12 +5,12 @@ description: JupyterHub and custom spawner for the Rubin Science Platform
 sources:
   - https://github.com/lsst-sqre/nublado
 home: https://nublado.lsst.io/
-appVersion: 12.0.2
+appVersion: 12.1.0
 
 dependencies:
   - name: jupyterhub
     # This is the Zero To Jupyterhub version (and quay.io/jupyterhub/k8s-hub)
-    version: "4.3.2"
+    version: "4.3.3"
     repository: https://jupyterhub.github.io/helm-chart/
 
 annotations:

applications/nublado/README.md

@@ -52,6 +52,7 @@ JupyterHub and custom spawner for the Rubin Science Platform
 | controller.config.images.numReleases | int | `1` | Number of most-recent releases to prepull. |
 | controller.config.images.numWeeklies | int | `2` | Number of most-recent weeklies to prepull. |
 | controller.config.images.pin | list | `[]` | List of additional image tags to prepull. Listing the image tagged as recommended here is recommended when using a Docker image source to ensure its name can be expanded properly in the menu. |
+| controller.config.images.prepullTimeout | string | `"10m"` | How long to wait for a prepull of a pod to finish before deciding it has failed, in Safir `parse_timedelta` format. |
 | controller.config.images.recommendedTag | string | `"recommended"` | Tag marking the recommended image (shown first in the menu) |
 | controller.config.images.refreshInterval | string | `"5m"` | How frequently to refresh the list of available images and compare it to the cached images on nodes to prepull new images, in Safir `parse_timedelta` format. Newly-available images will not appear in the menu for up to this interval. |
 | controller.config.images.source | object | None, must be specified | Source for prepulled images. For Docker, set `type` to `docker`, `registry` to the hostname and `repository` to the name of the repository. For Google Artifact Repository, set `type` to `google`, `location` to the region, `projectId` to the Google project, `repository` to the name of the repository, and `image` to the name of the image. |
@@ -155,7 +156,7 @@ JupyterHub and custom spawner for the Rubin Science Platform
 | jupyterhub.hub.extraVolumeMounts | list | `hub-config` and the Gafaelfawr token | Additional volume mounts for JupyterHub |
 | jupyterhub.hub.extraVolumes | list | The `hub-config` `ConfigMap` and the Gafaelfawr token | Additional volumes to make available to JupyterHub |
 | jupyterhub.hub.image.name | string | `"ghcr.io/lsst-sqre/nublado-jupyterhub"` | Image to use for JupyterHub |
-| jupyterhub.hub.image.tag | string | `"12.0.2"` | Tag of image to use for JupyterHub |
+| jupyterhub.hub.image.tag | string | `"12.1.0"` | Tag of image to use for JupyterHub |
 | jupyterhub.hub.loadRoles.server.scopes | list | See `values.yaml` | Default scopes for the user's lab, overridden to allow the lab to delete itself (which we use for our added menu items) |
 | jupyterhub.hub.networkPolicy.enabled | bool | `false` | Whether to enable the default `NetworkPolicy` (currently, the upstream one does not work correctly) |
 | jupyterhub.hub.resources | object | See `values.yaml` | Resource limits and requests |

applications/nublado/values-base.yaml

@@ -2,6 +2,7 @@ controller:
   slackAlerts: true
   config:
     images:
+      prepullTimeout: "20m"
       source:
         type: "docker"
         registry: "ts-dockerhub.lsst.org"

applications/nublado/values-summit.yaml

@@ -1,6 +1,7 @@
 controller:
   config:
     images:
+      prepullTimeout: "20m"
       source:
         type: "docker"
         registry: "ts-dockerhub.lsst.org"

applications/nublado/values.yaml

@@ -165,6 +165,10 @@ controller:
           effect: "NoSchedule"
 
     images:
+      # -- How long to wait for a prepull of a pod to finish before deciding
+      # it has failed, in Safir `parse_timedelta` format.
+      prepullTimeout: "10m"
+
       # -- How frequently to refresh the list of available images and compare
       # it to the cached images on nodes to prepull new images, in Safir
       # `parse_timedelta` format. Newly-available images will not appear in
@@ -566,7 +570,7 @@ jupyterhub:
       name: "ghcr.io/lsst-sqre/nublado-jupyterhub"
 
       # -- Tag of image to use for JupyterHub
-      tag: "12.0.2"
+      tag: "12.1.0"
 
     # -- Resource limits and requests
     # @default -- See `values.yaml`