From 4c7840ec5d20e47d49fad253505930974d5c43b9 Mon Sep 17 00:00:00 2001 From: Sotiris Salloumis Date: Wed, 4 Jun 2025 15:33:27 +0200 Subject: [PATCH 1/2] podResizeMutex cleanup Remove unecessary comment since podResizeMutex no longer exist. --- pkg/kubelet/kubelet_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 0e923277dca..cebe95bb69b 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -2427,8 +2427,7 @@ func TestPodResourceAllocationReset(t *testing.T) { defer testKubelet.Cleanup() kubelet := testKubelet.kubelet - // fakePodWorkers trigger syncPodFn synchronously on update, but entering - // kubelet.SyncPod while holding the podResizeMutex can lead to deadlock. + // fakePodWorkers trigger syncPodFn synchronously on update kubelet.podWorkers.(*fakePodWorkers).syncPodFn = func(_ context.Context, _ kubetypes.SyncPodType, _, _ *v1.Pod, _ *kubecontainer.PodStatus) (bool, error) { return false, nil From f8b893489c1557de4e33cd1b733b6c3ff9b7a5bc Mon Sep 17 00:00:00 2001 From: Sotiris Salloumis <159060890+esotsal@users.noreply.github.com> Date: Wed, 4 Jun 2025 20:36:15 +0200 Subject: [PATCH 2/2] Update pkg/kubelet/kubelet_test.go Co-authored-by: Natasha Sarkar --- pkg/kubelet/kubelet_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index cebe95bb69b..3e7cacdaf00 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -2427,7 +2427,8 @@ func TestPodResourceAllocationReset(t *testing.T) { defer testKubelet.Cleanup() kubelet := testKubelet.kubelet - // fakePodWorkers trigger syncPodFn synchronously on update + // fakePodWorkers triggers syncPodFn synchronously on update. We overwrite it here to + // avoid calling kubelet.SyncPod, which performs resize resource allocation. kubelet.podWorkers.(*fakePodWorkers).syncPodFn = func(_ context.Context, _ kubetypes.SyncPodType, _, _ *v1.Pod, _ *kubecontainer.PodStatus) (bool, error) { return false, nil