From 3ab3cf92bdadc10b08727240530089b7d2b85455 Mon Sep 17 00:00:00 2001
From: krassowski <5832902+krassowski@users.noreply.github.com>
Date: Sat, 27 Apr 2024 15:07:56 +0100
Subject: [PATCH 1/3] Upgrade to JupyterHub 5.0

---
 .../services/jupyterhub/files/jupyterhub/02-spawner.py          | 1 +
 .../template/modules/kubernetes/services/jupyterhub/main.tf     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/02-spawner.py b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/02-spawner.py
index c3934aad0..fe8fa69d0 100644
--- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/02-spawner.py
+++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/02-spawner.py
@@ -73,6 +73,7 @@ def service_for_jhub_apps(name, url):
                 "external": True,
             },
             "oauth_no_confirm": True,
+            "oauth_redirect_uri": "/services/:name/oauth_callback",
         }
 
     c.JupyterHub.services.extend(
diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/main.tf b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/main.tf
index cf86d5a03..3ac041aac 100644
--- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/main.tf
+++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/main.tf
@@ -57,7 +57,7 @@ resource "helm_release" "jupyterhub" {
 
   repository = "https://jupyterhub.github.io/helm-chart/"
   chart      = "jupyterhub"
-  version    = "3.2.1"
+  version    = "4.0.0-0.dev.git.6586.h0a16e5a0"
 
   values = concat([
     file("${path.module}/values.yaml"),

From 5a682f712be61eabb78ff9356db12552b3707230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Krassowski?=
 <5832902+krassowski@users.noreply.github.com>
Date: Mon, 6 May 2024 12:37:19 +0100
Subject: [PATCH 2/3] Remove `oauth_no_confirm`

---
 .../services/jupyterhub/files/jupyterhub/02-spawner.py        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/02-spawner.py b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/02-spawner.py
index fe8fa69d0..4e9a4eceb 100644
--- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/02-spawner.py
+++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/02-spawner.py
@@ -71,9 +71,7 @@ def service_for_jhub_apps(name, url):
                 "name": name,
                 "url": url,
                 "external": True,
-            },
-            "oauth_no_confirm": True,
-            "oauth_redirect_uri": "/services/:name/oauth_callback",
+            }
         }
 
     c.JupyterHub.services.extend(

From 40ef57783e09d648ed0b5bc747309d75eb570a9b Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 11:38:00 +0000
Subject: [PATCH 3/3] [pre-commit.ci] Apply automatic pre-commit fixes

---
 .../services/jupyterhub/files/jupyterhub/02-spawner.py          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/02-spawner.py b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/02-spawner.py
index 4e9a4eceb..ea9511a4c 100644
--- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/02-spawner.py
+++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/02-spawner.py
@@ -71,7 +71,7 @@ def service_for_jhub_apps(name, url):
                 "name": name,
                 "url": url,
                 "external": True,
-            }
+            },
         }
 
     c.JupyterHub.services.extend(