From b85b6cd2c72e075e390258fe8db173633fbe17c7 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Tue, 17 Sep 2024 11:25:04 -0700
Subject: [PATCH 1/5] add timeouts for data8 chp

---
 deployments/data8/config/common.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/deployments/data8/config/common.yaml b/deployments/data8/config/common.yaml
index f8f31528d..7845b774f 100644
--- a/deployments/data8/config/common.yaml
+++ b/deployments/data8/config/common.yaml
@@ -21,6 +21,9 @@ jupyterhub:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
   proxy:
     chp:
+      extraCommandLineFlags:
+        - "--timeout=5000"
+        - "--proxy-timeout=5000"
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
       resources:

From 284bbc1114852f12b67e8fdbfab12042cb4f7de6 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Tue, 17 Sep 2024 11:27:30 -0700
Subject: [PATCH 2/5] add timeouts to datahub chp

---
 deployments/datahub/config/common.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml
index df4a601de..b501545fc 100644
--- a/deployments/datahub/config/common.yaml
+++ b/deployments/datahub/config/common.yaml
@@ -168,6 +168,9 @@ jupyterhub:
 
   proxy:
     chp:
+      extraCommandLineFlags:
+        - "--timeout=5000"
+        - "--proxy-timeout=5000"
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
       resources:

From 8dfbe27310d7cd48c5677eb3939029a457251901 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Tue, 17 Sep 2024 11:27:39 -0700
Subject: [PATCH 3/5] add timeouts to data100 chp

---
 deployments/data100/config/common.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml
index 8da6b5791..9f4f0c4a3 100644
--- a/deployments/data100/config/common.yaml
+++ b/deployments/data100/config/common.yaml
@@ -10,6 +10,9 @@ jupyterhub:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
   proxy:
     chp:
+      extraCommandLineFlags:
+        - "--timeout=5000"
+        - "--proxy-timeout=5000"
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
       resources:

From 5d787ba094caea2f1d7f90ce514cf634660e2a9b Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Tue, 17 Sep 2024 13:06:02 -0700
Subject: [PATCH 4/5] set these timeouts for all hubs just in case this ends up
 helping

---
 hub/values.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hub/values.yaml b/hub/values.yaml
index 95b93d9a9..9c814485e 100644
--- a/hub/values.yaml
+++ b/hub/values.yaml
@@ -42,10 +42,10 @@ jupyterhub:
       image:
         tag: 4.6.2
       extraCommandLineFlags:
-        # set the timeout and proxyTimeout to 24 hours (arg is in milliseconds)
+        # set the timeout and proxyTimeout to 5 seconds
         # https://github.com/http-party/node-http-proxy?tab=readme-ov-file#options
-        # - "--timeout=86400000"
-        # - "--proxy-timeout=86400000"
+        - "--timeout=5000"
+        - "--proxy-timeout=5000"
       resources:
         requests:
           # FIXME: We want no guarantees here!!!

From 469f3ae8e19806f880bddc2f92f4253838139fcc Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Tue, 17 Sep 2024 16:59:35 -0700
Subject: [PATCH 5/5] removing per-hub config changes

---
 deployments/data100/config/common.yaml | 3 ---
 deployments/data8/config/common.yaml   | 3 ---
 deployments/datahub/config/common.yaml | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml
index 9f4f0c4a3..8da6b5791 100644
--- a/deployments/data100/config/common.yaml
+++ b/deployments/data100/config/common.yaml
@@ -10,9 +10,6 @@ jupyterhub:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
   proxy:
     chp:
-      extraCommandLineFlags:
-        - "--timeout=5000"
-        - "--proxy-timeout=5000"
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
       resources:
diff --git a/deployments/data8/config/common.yaml b/deployments/data8/config/common.yaml
index 7845b774f..f8f31528d 100644
--- a/deployments/data8/config/common.yaml
+++ b/deployments/data8/config/common.yaml
@@ -21,9 +21,6 @@ jupyterhub:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
   proxy:
     chp:
-      extraCommandLineFlags:
-        - "--timeout=5000"
-        - "--proxy-timeout=5000"
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
       resources:
diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml
index b501545fc..df4a601de 100644
--- a/deployments/datahub/config/common.yaml
+++ b/deployments/datahub/config/common.yaml
@@ -168,9 +168,6 @@ jupyterhub:
 
   proxy:
     chp:
-      extraCommandLineFlags:
-        - "--timeout=5000"
-        - "--proxy-timeout=5000"
       nodeSelector:
         hub.jupyter.org/pool-name: core-pool-2024-05-08
       resources: