feat(jupyterhub): configure application (#618)

* jupyterhub: configure application

* jupyterhub: update vendor_images

* jupyterhub: bump version

* Update Chart.yaml

* Update deps.yaml

---------

Co-authored-by: David van der Spek <[email protected]>

Author: gordalina

jupyterhub/helm/jupyterhub/Chart.lock

@@ -2,8 +2,5 @@ dependencies:
 - name: jupyterhub
   repository: https://charts.bitnami.com/bitnami
   version: 3.0.12
-- name: postgres
-  repository: https://pluralsh.github.io/module-library
-  version: 0.1.16
-digest: sha256:ad4f0aae95f8b20c092751bc8db4352963aedfd920c8aaf2aa45d6de49fa2e36
-generated: "2023-03-31T15:40:56.375493-10:00"
+digest: sha256:7dbd4d47e44c4b1d35ad8ee1ccb3f52c3be682826399da28bffb98564b53938a
+generated: "2023-04-04T18:44:50.023965-10:00"

jupyterhub/helm/jupyterhub/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: jupyterhub
 description: helm chart for jupyterhub
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: "3.1.1"
 maintainers:
   - name: Samuel Gordalina
@@ -11,6 +11,3 @@ dependencies:
   - name: jupyterhub
     version: 3.0.12
     repository: https://charts.bitnami.com/bitnami
-  - name: postgres
-    version: 0.1.16
-    repository: https://pluralsh.github.io/module-library

jupyterhub/helm/jupyterhub/charts/postgres-0.1.16.tgz

@@ -18,6 +18,6 @@ spec:
       repo: ingress-nginx
       version: ">= 0.1.2"
     - type: helm
-      name: postgres
-      repo: postgres
-      version: ">= 0.2.0"
+      name: ingress-nginx
+      repo: ingress-nginx
+      version: '>= 0.1.2'

jupyterhub/helm/jupyterhub/deps.yaml

@@ -1,91 +1,46 @@
-# Default values for jupyterhub.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: dkr.plural.sh/jupyterhub/bitnami/jupyterhub
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: "3.1.1"
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-podAnnotations: {}
-
-podSecurityContext:
-  {}
-  # fsGroup: 2000
-
-securityContext:
-  {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
-
-ingress:
-  enabled: true
-  className: nginx
-  annotations:
-    kubernetes.io/tls-acme: "true"
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-    # Extend timeout to allow long running queries.
-    nginx.ingress.kubernetes.io/proxy-connect-timeout: "300"
-    nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
-    nginx.ingress.kubernetes.io/proxy-send-timeout: "300"
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/use-regex: "true"
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-resources:
-  {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
+jupyterhub:
+  hub:
+    adminUser: admin
+    password: password
+    # image:
+    #   repository: dkr.plural.sh/jupyterhub/bitnami/jupyterhub
+    #   tag: 3.1.1-debian-11-r20
+    metrics:
+      serviceMonitor:
+        enabled: true
+
+  proxy:
+    # image:
+      # registry: dkr.plural.sh/jupyterhub/bitnami/configurable-http-proxy
+      # tag: 4.5.4-debian-11-r39
+    ingress:
+      enabled: true
+      path: /.*
+      ingressClassName: nginx
+      annotations:
+        kubernetes.io/tls-acme: "true"
+        cert-manager.io/cluster-issuer: letsencrypt-prod
+        nginx.ingress.kubernetes.io/force-ssl-redirect: 'true'
+        nginx.ingress.kubernetes.io/use-regex: "true"
+      hostname: chart-example.local
+      extraTls: []
+    service:
+      public:
+        type: ClusterIP
+    metrics:
+      serviceMonitor:
+        enabled: true
+
+  singleuser:
+    # image:
+      # repository: dkr.plural.sh/jupyterhub/bitnami/jupyter-base-notebook
+      # tag: 3.1.1-debian-11-r20
+    notebookDir: /data
+    extraEnvVars:
+      HOME: /data
+      JUPYTERHUB_ROOT_DIR: /data
+
+  # auxiliaryImage:
+    # image:
+      # repository: dkr.plural.sh/jupyterhub/bitnami/bitnami-shell
+      # tag: 11-debian-11-r102

jupyterhub/helm/jupyterhub/templates/NOTES.txt

@@ -1,18 +1,20 @@
 {{ $hostname := default "example.com" .Values.hostname }}
+{{ $password := dedupe . "jupyterhub.jupyterhub.hub.password" (randAlphaNum 30) }}
 
 global:
   application:
     links:
     - description: jupyterhub instance
       url: {{ $hostname }}
 
-ingress:
-  hosts:
-   - host: {{ $hostname }}
-     paths:
-       - path: /
-         pathType: ImplementationSpecific
-  tls:
-   - secretName: jupyterhub-tls
-     hosts:
-       - {{ $hostname }}
+jupyterhub:
+  hub:
+    password: {{ $password }}
+
+  proxy:
+    ingress:
+      hostname: {{ $hostname }}
+      extraTls:
+        - hosts:
+          - {{ $hostname }}
+          secretName: jupyterhub-tls

jupyterhub/helm/jupyterhub/templates/tests/test-connection.yaml

@@ -1 +1,5 @@
 Your jupyterhub installation is available at https://{{ .Values.hostname }}
+
+You can login with
+  username: {{ .Values.jupyterhub.hub.adminUser }}
+  password: {{ .Values.jupyterhub.hub.password }}

jupyterhub/helm/jupyterhub/values.yaml

@@ -1,3 +1,10 @@
 docker.io:
   images-by-tag-regex:
-    bitnami/jupyterhub: ^v?[0-9]+\.[0-9]+?\.[0-9]+$
+    # >= 3.1.0
+    bitnami/jupyterhub: (?:^v?3\.(?:[1-9]|[1-9][0-9]{1,})\.[0-9]+$)|(?:^v?(?:[4-9]|[1-9][0-9]{1,})\.[0-9]+?\.[0-9]+$)
+    # >= 3.1.0
+    bitnami/jupyter-base-notebook: (?:^v?3\.(?:[1-9]|[1-9][0-9]{1,})\.[0-9]+$)|(?:^v?(?:[4-9]|[1-9][0-9]{1,})\.[0-9]+?\.[0-9]+$)
+    # >= 4.5.0
+    bitnami/configurable-http-proxy: (?:^v?4\.(?:[5-9]|[1-9][0-9]{1,})\.[0-9]+$)|(?:^v?(?:[5-9]|[1-9][0-9]{1,})\.[0-9]+?\.[0-9]+$)
+    # >= 10
+    bitnami/bitnami-shell: (?:^v?(?:[1-9][0-9]{1,})$)