From a4154485474125e2c5301574907acf119ace9409 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 07:27:38 +0100 Subject: [PATCH 01/16] Bump kr8s to 0.9.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 665275ceb..597392581 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s==0.9.0 +kr8s==0.9.2 From 2c504d8566b1843e84b02d31213708dd162ef8d1 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 10:03:56 +0100 Subject: [PATCH 02/16] Downgrade kr8s to 0.9.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 597392581..b844362f9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s==0.9.2 +kr8s==0.9.1 From b75b59040961950dd8e39a88e3ebae39e80f8dc9 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 10:35:21 +0100 Subject: [PATCH 03/16] Downgrade kr8s to 0.9.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b844362f9..665275ceb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s==0.9.1 +kr8s==0.9.0 From 334f14daf3b9b508fb9beb056757b6601624e09a Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 10:59:00 +0100 Subject: [PATCH 04/16] Downgrade kr8s to 0.9.0 (force ci) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 665275ceb..68deefa42 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -dask>=2022.08.1 +dask>=2022.08.2 distributed>=2022.08.1 kubernetes>=12.0.1 kubernetes-asyncio>=12.0.1 From b42869b500b89c9f03f2f7aafc2db4c529d9f0b1 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 11:39:47 +0100 Subject: [PATCH 05/16] Bump kr8s to 0.9.1 (again) --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 68deefa42..b844362f9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -dask>=2022.08.2 +dask>=2022.08.1 distributed>=2022.08.1 kubernetes>=12.0.1 kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s==0.9.0 +kr8s==0.9.1 From 25bf54db1dc2513fcce16caf42d519708d14d106 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 13:22:02 +0100 Subject: [PATCH 06/16] Bump to first commit of 0.9.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b844362f9..f1d631a8d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s==0.9.1 +git+https://github.com/kr8s-org/kr8s.git@223cbe897da378adc8ce5adaf4e3c7a486354941 From 31c81268e93cef6129a68c51d203bdb4e73b57f2 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 13:24:25 +0100 Subject: [PATCH 07/16] Fix syntax --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f1d631a8d..e59a106ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -git+https://github.com/kr8s-org/kr8s.git@223cbe897da378adc8ce5adaf4e3c7a486354941 +kr8s @ git+https://github.com/kr8s-org/kr8s.git@223cbe897da378adc8ce5adaf4e3c7a486354941 From 7fe286139ec7f086315cbab3c3c9eaff7b12e420 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 14:00:08 +0100 Subject: [PATCH 08/16] Actually choose first commit --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e59a106ad..9663718ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s @ git+https://github.com/kr8s-org/kr8s.git@223cbe897da378adc8ce5adaf4e3c7a486354941 +kr8s @ git+https://github.com/kr8s-org/kr8s.git@4989d7c5fbeabf96d98e71c5a7e98aa536eacea7 From 9c56c4bf0c93bc92521d388325bb7bdd881abec7 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 14:29:37 +0100 Subject: [PATCH 09/16] Second commit of 0.9.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9663718ef..e5aee7e39 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s @ git+https://github.com/kr8s-org/kr8s.git@4989d7c5fbeabf96d98e71c5a7e98aa536eacea7 +kr8s @ git+https://github.com/kr8s-org/kr8s.git@174f6c066b222bd24795ee2527686c0fb7772691 From 60f35f4e7ad4aba1eafcac1ce06cc9c1c1a922e1 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 15:14:52 +0100 Subject: [PATCH 10/16] Third commit of 0.9.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e5aee7e39..9172101ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s @ git+https://github.com/kr8s-org/kr8s.git@174f6c066b222bd24795ee2527686c0fb7772691 +kr8s @ git+https://github.com/kr8s-org/kr8s.git@595f74456e5c88f77ca8d48a712605e2ba2c2b78 From 55d2169b5d19edc8d5f43f7b355320601f16e7d3 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 15:52:00 +0100 Subject: [PATCH 11/16] Fourth commit of 0.9.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9172101ae..e59a106ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s @ git+https://github.com/kr8s-org/kr8s.git@595f74456e5c88f77ca8d48a712605e2ba2c2b78 +kr8s @ git+https://github.com/kr8s-org/kr8s.git@223cbe897da378adc8ce5adaf4e3c7a486354941 From e9bfc2a5f342599363e1e7aef1f6d51a696684bd Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 17:39:56 +0100 Subject: [PATCH 12/16] Bump kr8s to v0.10.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e59a106ad..c67670b66 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s @ git+https://github.com/kr8s-org/kr8s.git@223cbe897da378adc8ce5adaf4e3c7a486354941 +kr8s @ git+https://github.com/kr8s-org/kr8s.git@v0.10.0 From 773af0f9d16b5acac7510b5b7e609702098d5136 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 17:52:58 +0100 Subject: [PATCH 13/16] Try a dev version that reverts the change we see the hangs in --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c67670b66..c54a0c688 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s @ git+https://github.com/kr8s-org/kr8s.git@v0.10.0 +kr8s @ git+https://github.com/jacobtomlinson/kr8s.git@kr8s-testing From 8405b87e023d26e008d326d4e7a34f87fdd5b2d3 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 19:42:40 +0100 Subject: [PATCH 14/16] Fix branch name --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c54a0c688..6ec5a525d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s @ git+https://github.com/jacobtomlinson/kr8s.git@kr8s-testing +kr8s @ git+https://github.com/jacobtomlinson/kr8s.git@create-session From 14f91d63927040204d302a26b9bc7d8362b1e9bf Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Thu, 18 Apr 2024 20:54:45 +0100 Subject: [PATCH 15/16] Use async_refresh() instead of private _refresh() --- dask_kubernetes/operator/_objects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dask_kubernetes/operator/_objects.py b/dask_kubernetes/operator/_objects.py index 79b96f333..da34a44a1 100644 --- a/dask_kubernetes/operator/_objects.py +++ b/dask_kubernetes/operator/_objects.py @@ -71,7 +71,7 @@ async def scheduler_service(self) -> Service: return services[0] async def ready(self) -> bool: - await self._refresh() + await self.async_refresh() return ( "status" in self.raw and "phase" in self.status From 69830ac21707ac35eea037b9e20e3c529678d2d5 Mon Sep 17 00:00:00 2001 From: Jacob Tomlinson Date: Fri, 19 Apr 2024 08:45:37 +0100 Subject: [PATCH 16/16] Try out more robust fix to avoid sharing kr8s objects between event loops --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6ec5a525d..a474ebba6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1 kopf>=1.35.3 pykube-ng>=22.9.0 rich>=12.5.1 -kr8s @ git+https://github.com/jacobtomlinson/kr8s.git@create-session +kr8s @ git+https://github.com/jacobtomlinson/kr8s.git@no-share-api-loops