Merge pull request #2730 from minrk/sweep-orphans

sweep outdated pods in minesweeper
jupyterhub · Aug 28, 2023 · 6b0aba3 · 6b0aba3
2 parents bf46054 + cd8659d
commit 6b0aba3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/mybinder/files/minesweeper/minesweeper.py b/mybinder/files/minesweeper/minesweeper.py
@@ -69,6 +69,8 @@
         "status",
         "uids",
     ],
+    # 8 hour max age, cleanup after culler
+    "pod_max_age_seconds": 0,
 }
 
 default_config.update(herorat.default_config)
@@ -378,7 +380,7 @@ async def node_report(pods=None, userid=1000):
 
     # finally, terminate pods that meet the immediate termination condition
     pods_to_terminate = [
-        pod for pod in suspicious_pods if pod["minesweeper"]["should_terminate"]
+        pod for pod in pods.values() if pod["minesweeper"]["should_terminate"]
     ]
     if pods_to_terminate:
         terminate_futures = [

diff --git a/mybinder/files/minesweeper/secrets/herorat.py b/mybinder/files/minesweeper/secrets/herorat.py
diff --git a/secrets/config/common/common.yaml b/secrets/config/common/common.yaml