From a059d6ffbb1031a65d8d12dd4f53e4f0666effd9 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik@sundellopensource.se>
Date: Thu, 26 Sep 2024 16:29:39 +0200
Subject: [PATCH 1/2] Update traefik from 2.10.1 to 3.1.4

---
 tljh/traefik.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tljh/traefik.py b/tljh/traefik.py
index a19a3de..9f0aae1 100644
--- a/tljh/traefik.py
+++ b/tljh/traefik.py
@@ -29,13 +29,13 @@ else:
     plat = None
 
 # Traefik releases: https://github.com/traefik/traefik/releases
-traefik_version = "2.10.1"
+traefik_version = "3.1.4"
 
 # record sha256 hashes for supported platforms here
 # checksums are published in the checksums.txt of each release
 checksums = {
-    "linux_amd64": "8d9bce0e6a5bf40b5399dbb1d5e3e5c57b9f9f04dd56a2dd57cb0713130bc824",
-    "linux_arm64": "260a574105e44901f8c9c562055936d81fbd9c96a21daaa575502dc69bfe390a",
+    "linux_amd64": "eb7227b1b235195355904839c514a9ed6a0aecdcf5dab02ad48db21b05c5e700",
+    "linux_arm64": "e5d970a7f11267b70a8e308cb80f859bba4f420f24789f7393fdf3f4cd031631",
 }
 
 _tljh_path = Path(__file__).parent.resolve()

From 3ddc1e8d5934e4b7fc5046ae3dd0f3c6d27c9b1c Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik@sundellopensource.se>
Date: Thu, 26 Sep 2024 22:32:26 +0200
Subject: [PATCH 2/2] refactor: exctract calling traefik setup from
 ensure_jupyterhub_package func

---
 tljh/installer.py | 2 +-
 tljh/traefik.py   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tljh/installer.py b/tljh/installer.py
index de817a1..aacd03a 100644
--- a/tljh/installer.py
+++ b/tljh/installer.py
@@ -115,7 +115,6 @@ def ensure_jupyterhub_package(prefix):
         os.path.join(HERE, "requirements-hub-env.txt"),
         upgrade=True,
     )
-    traefik.ensure_traefik_binary(prefix)
 
 
 def ensure_usergroups():
@@ -536,6 +535,7 @@ def main():
 
     logger.info("Setting up JupyterHub...")
     ensure_jupyterhub_package(HUB_ENV_PREFIX)
+    traefik.ensure_traefik_binary(HUB_ENV_PREFIX)
 
     # Stop the http server with the progress page before traefik starts
     if args.progress_page_server_pid:
diff --git a/tljh/traefik.py b/tljh/traefik.py
index 9f0aae1..07b2f48 100644
--- a/tljh/traefik.py
+++ b/tljh/traefik.py
@@ -91,7 +91,10 @@ def check_traefik_version(traefik_bin):
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=2, giveup=fatal_error)
 def ensure_traefik_binary(prefix):
-    """Download and install the traefik binary to a location identified by a prefix path such as '/opt/tljh/hub/'"""
+    """
+    Ensure that a traefik binary of a hardcoded version is made available at a
+    prefix path such as '/opt/tljh/hub/'.
+    """
     if plat is None:
         raise OSError(
             f"Error. Platform: {os.uname().sysname} / {machine} Not supported."