mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
Merge pull request #131787 from rata/automated-cherry-pick-of-#130800-upstream-release-1.31
Automated cherry pick of #130800: Fix unit tests on windows
This commit is contained in:
commit
a44b0a321c
@ -143,6 +143,11 @@ func (kl *Kubelet) getKubeletMappings() (uint32, uint32, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Windows doesn't support user namespaces, let's return the default mappings.
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
return defaultFirstID, defaultLen, nil
|
||||||
|
}
|
||||||
|
|
||||||
_, err := user.Lookup(kubeletUser)
|
_, err := user.Lookup(kubeletUser)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
var unknownUserErr user.UnknownUserError
|
var unknownUserErr user.UnknownUserError
|
||||||
|
29
pkg/kubelet/userns/types.go
Normal file
29
pkg/kubelet/userns/types.go
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2025 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package userns
|
||||||
|
|
||||||
|
import "k8s.io/apimachinery/pkg/types"
|
||||||
|
|
||||||
|
// Here go types that are common for all supported OS (windows, linux).
|
||||||
|
|
||||||
|
type userNsPodsManager interface {
|
||||||
|
HandlerSupportsUserNamespaces(runtimeHandler string) (bool, error)
|
||||||
|
GetPodDir(podUID types.UID) string
|
||||||
|
ListPodsFromDisk() ([]types.UID, error)
|
||||||
|
GetKubeletMappings() (uint32, uint32, error)
|
||||||
|
GetMaxPods() int
|
||||||
|
}
|
@ -1,3 +1,6 @@
|
|||||||
|
//go:build !windows
|
||||||
|
// +build !windows
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2022 The Kubernetes Authors.
|
Copyright 2022 The Kubernetes Authors.
|
||||||
|
|
||||||
@ -43,14 +46,6 @@ const userNsLength = (1 << 16)
|
|||||||
// since Go maps never free memory.
|
// since Go maps never free memory.
|
||||||
const mapReInitializeThreshold = 1000
|
const mapReInitializeThreshold = 1000
|
||||||
|
|
||||||
type userNsPodsManager interface {
|
|
||||||
HandlerSupportsUserNamespaces(runtimeHandler string) (bool, error)
|
|
||||||
GetPodDir(podUID types.UID) string
|
|
||||||
ListPodsFromDisk() ([]types.UID, error)
|
|
||||||
GetKubeletMappings() (uint32, uint32, error)
|
|
||||||
GetMaxPods() int
|
|
||||||
}
|
|
||||||
|
|
||||||
type UsernsManager struct {
|
type UsernsManager struct {
|
||||||
used *allocator.AllocationBitmap
|
used *allocator.AllocationBitmap
|
||||||
usedBy map[types.UID]uint32 // Map pod.UID to range used
|
usedBy map[types.UID]uint32 // Map pod.UID to range used
|
||||||
@ -132,7 +127,7 @@ func (m *UsernsManager) readMappingsFromFile(pod types.UID) ([]byte, error) {
|
|||||||
func MakeUserNsManager(kl userNsPodsManager) (*UsernsManager, error) {
|
func MakeUserNsManager(kl userNsPodsManager) (*UsernsManager, error) {
|
||||||
kubeletMappingID, kubeletMappingLen, err := kl.GetKubeletMappings()
|
kubeletMappingID, kubeletMappingLen, err := kl.GetKubeletMappings()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, fmt.Errorf("kubelet mappings: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if kubeletMappingID%userNsLength != 0 {
|
if kubeletMappingID%userNsLength != 0 {
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
//go:build !windows
|
||||||
|
// +build !windows
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2022 The Kubernetes Authors.
|
Copyright 2022 The Kubernetes Authors.
|
||||||
|
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
//go:build !windows
|
||||||
|
// +build !windows
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2024 The Kubernetes Authors.
|
Copyright 2024 The Kubernetes Authors.
|
||||||
|
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
//go:build !windows
|
||||||
|
// +build !windows
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2022 The Kubernetes Authors.
|
Copyright 2022 The Kubernetes Authors.
|
||||||
|
|
||||||
@ -20,7 +23,6 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
goruntime "runtime"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
@ -289,7 +291,6 @@ func TestGetOrCreateUserNamespaceMappings(t *testing.T) {
|
|||||||
runtimeUserns bool
|
runtimeUserns bool
|
||||||
runtimeHandler string
|
runtimeHandler string
|
||||||
success bool
|
success bool
|
||||||
skipOnWindows bool
|
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "no user namespace",
|
name: "no user namespace",
|
||||||
@ -323,7 +324,6 @@ func TestGetOrCreateUserNamespaceMappings(t *testing.T) {
|
|||||||
expMode: runtimeapi.NamespaceMode_POD,
|
expMode: runtimeapi.NamespaceMode_POD,
|
||||||
runtimeUserns: true,
|
runtimeUserns: true,
|
||||||
success: true,
|
success: true,
|
||||||
skipOnWindows: true,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "user namespace, but no runtime support",
|
name: "user namespace, but no runtime support",
|
||||||
@ -348,10 +348,6 @@ func TestGetOrCreateUserNamespaceMappings(t *testing.T) {
|
|||||||
|
|
||||||
for _, tc := range cases {
|
for _, tc := range cases {
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
if tc.skipOnWindows && goruntime.GOOS == "windows" {
|
|
||||||
// TODO: remove skip once the failing test has been fixed.
|
|
||||||
t.Skip("Skip failing test on Windows.")
|
|
||||||
}
|
|
||||||
// These tests will create the userns file, so use an existing podDir.
|
// These tests will create the userns file, so use an existing podDir.
|
||||||
testUserNsPodsManager := &testUserNsPodsManager{
|
testUserNsPodsManager := &testUserNsPodsManager{
|
||||||
podDir: t.TempDir(),
|
podDir: t.TempDir(),
|
||||||
|
50
pkg/kubelet/userns/userns_manager_windows.go
Normal file
50
pkg/kubelet/userns/userns_manager_windows.go
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2025 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package userns
|
||||||
|
|
||||||
|
import (
|
||||||
|
v1 "k8s.io/api/core/v1"
|
||||||
|
"k8s.io/apimachinery/pkg/types"
|
||||||
|
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
|
||||||
|
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
||||||
|
)
|
||||||
|
|
||||||
|
type UsernsManager struct{}
|
||||||
|
|
||||||
|
func MakeUserNsManager(kl userNsPodsManager) (*UsernsManager, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Release releases the user namespace allocated to the specified pod.
|
||||||
|
func (m *UsernsManager) Release(podUID types.UID) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *UsernsManager) GetOrCreateUserNamespaceMappings(pod *v1.Pod, runtimeHandler string) (*runtimeapi.UserNamespace, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// CleanupOrphanedPodUsernsAllocations reconciliates the state of user namespace
|
||||||
|
// allocations with the pods actually running. It frees any user namespace
|
||||||
|
// allocation for orphaned pods.
|
||||||
|
func (m *UsernsManager) CleanupOrphanedPodUsernsAllocations(pods []*v1.Pod, runningPods []*kubecontainer.Pod) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func EnabledUserNamespacesSupport() bool {
|
||||||
|
return false
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user