Merge pull request #1 from eth-cscs/v0.4.0

Make reloader optional and add single-user port to values

chart/Chart.yaml

@@ -2,13 +2,13 @@ apiVersion: v2
 name: f7t4jhub
 description: A Helm chart to Deploy JupyterHub with the FirecREST Spawner
 type: application
-version: 0.3.0
+version: 0.4.0
 appVersion: "4.1.5"
 dependencies:
   - name: f7t4jhub
-    version: 0.3.0
+    version: 0.4.0
     repository: "file://./f7t4jhub"
-# Optional dependencies used at CSCS
-#  - name: reloader
-#    version: v1.0.51
-#    repository: https://stakater.github.io/stakater-charts
+  - name: reloader
+    version: v1.0.51
+    repository: https://stakater.github.io/stakater-charts
+    condition: reloader.reloader.enabled

chart/f7t4jhub/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: f7t4jhub
 description: A Helm chart to Deploy JupyterHub with the FirecREST Spawner
 type: application
-version: 0.3.0
+version: 0.4.0
 appVersion: "4.1.5"

chart/f7t4jhub/files/jupyterhub-config.py

@@ -1362,7 +1362,7 @@ async def refresh_user(self, user, handler=None):
 #  
 #  New in version 0.7.
 #  Default: 0
-c.Spawner.port = 57001
+c.Spawner.port = {{ .Values.config.spawner.port }}
 
 ## An optional hook function that you can implement to do work after the spawner
 #  stops.

chart/values.yaml

@@ -1,9 +1,17 @@
-# reloader:
-#   reloader:
-#     watchGlobally: false
-#     isArgoRollouts: true
-#     serviceAccount:
-#       create: false
+reloader:
+  reloader:
+    # Set to true to enable the reloader for automatically restarting pods on ConfigMap/Secret changes.
+    enabled: false
+
+    # If true, the reloader will watch ConfigMaps and Secrets in all namespaces, not just its own.
+    watchGlobally: false
+
+    # Set to true if using Argo Rollouts for managing deployments, which may require specific handling.
+    isArgoRollouts: true
+
+    serviceAccount:
+      # Set to true to create a new service account for the reloader. If false, it will use an existing one.
+      create: false
 
 f7t4jhub:
   setup:
@@ -82,6 +90,9 @@ f7t4jhub:
       # Host for the spawner (replace with your own host)
       host: 'dom'
 
+      # Port for the single-user server. Set to 0 to use random port
+      port: 57001
+
       # Node name template (replace with your own node name template)
       nodeNameTemplate: '{}.example.com'