From 16d76f6813a3013cf00fd22d4c82ddda9732ada3 Mon Sep 17 00:00:00 2001 From: Rodrigo Campos Date: Tue, 7 Mar 2023 17:33:46 +0100 Subject: [PATCH] kubelet: Don't reserve mapping for userns phase II Latest changes to KEP-127 removed that phase, so let's stop reserving those IDs for that. While we are there, we replace 0 for 0*65536 as before we had a bug that we were not multiplying the index, to avoid bugs in the future. Signed-off-by: Rodrigo Campos --- pkg/kubelet/userns_manager.go | 5 ----- pkg/kubelet/userns_manager_test.go | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkg/kubelet/userns_manager.go b/pkg/kubelet/userns_manager.go index c1e05931743..177f4ae112d 100644 --- a/pkg/kubelet/userns_manager.go +++ b/pkg/kubelet/userns_manager.go @@ -141,11 +141,6 @@ func MakeUserNsManager(kl userNsPodsManager) (*usernsManager, error) { return nil, err } - // Second block will be used for phase II. Don't assign that range for now. - if _, err := m.used.Allocate(1); err != nil { - return nil, err - } - // do not bother reading the list of pods if user namespaces are not enabled. if !utilfeature.DefaultFeatureGate.Enabled(features.UserNamespacesStatelessPodsSupport) { return &m, nil diff --git a/pkg/kubelet/userns_manager_test.go b/pkg/kubelet/userns_manager_test.go index 594de3f59f1..bd0aa7b27d1 100644 --- a/pkg/kubelet/userns_manager_test.go +++ b/pkg/kubelet/userns_manager_test.go @@ -46,8 +46,7 @@ func TestUserNsManagerAllocate(t *testing.T) { m, err := MakeUserNsManager(testUserNsPodsManager) require.NoError(t, err) - assert.Equal(t, true, m.isSet(0), "m.isSet(0) should be true") - assert.Equal(t, true, m.isSet(1), "m.isSet(1) should be true") + assert.Equal(t, true, m.isSet(0*65536), "m.isSet(0) should be true") allocated, length, err := m.allocateOne("one") assert.NoError(t, err)