From b8361f9c6eaf03a70ef205da6eb9e1c61c1ace8f Mon Sep 17 00:00:00 2001 From: Rodrigo Campos Date: Fri, 14 Mar 2025 16:56:48 +0100 Subject: [PATCH] Revert "pkg/kubelet: Fix userns tests on Windows" This reverts commit 74b069d0fab85fc0c111dc20f0f6edd05781fb9a. Now that pkg/kubelet/userns has a windows stub, there is no need to handle this here. Let's remove this code so if it's ever called from windows, we find an error and the bug surfaces immediately. I've added it yesterday as an abundance of caution, to make sure the tests go back to green in the master branch. But now that everything is green again, it should be safe to remove it. Signed-off-by: Rodrigo Campos --- pkg/kubelet/kubelet_pods.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index 068d8bfd437..f763f8e385f 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -131,11 +131,6 @@ func (kl *Kubelet) getKubeletMappings() (uint32, uint32, error) { return defaultFirstID, defaultLen, nil } - // Windows doesn't support user namespaces, let's return the default mappings. - if runtime.GOOS == "windows" { - return defaultFirstID, defaultLen, nil - } - _, err := user.Lookup(kubeletUser) if err != nil { var unknownUserErr user.UnknownUserError