From 569eb41f23810b9af4d651222e5d756b6a8f8a0f Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Wed, 12 Feb 2025 15:27:58 -0800 Subject: [PATCH] fixing k8s.io/kubernetes/pkg/kubelet/cm/memorymanager unit tests on Windows Signed-off-by: Mark Rossetti --- .../cm/memorymanager/memory_manager_test.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/cm/memorymanager/memory_manager_test.go b/pkg/kubelet/cm/memorymanager/memory_manager_test.go index 44c654be157..8d405348555 100644 --- a/pkg/kubelet/cm/memorymanager/memory_manager_test.go +++ b/pkg/kubelet/cm/memorymanager/memory_manager_test.go @@ -21,6 +21,7 @@ import ( "fmt" "os" "reflect" + goruntime "runtime" "strings" "testing" @@ -1896,6 +1897,13 @@ func TestRemoveContainer(t *testing.T) { } } +func getPolicyNameForOs() policyType { + if goruntime.GOOS == "windows" { + return policyTypeBestEffort + } + return policyTypeStatic +} + func TestNewManager(t *testing.T) { machineInfo := returnMachineInfo() expectedReserved := systemReservedMemory{ @@ -1909,7 +1917,7 @@ func TestNewManager(t *testing.T) { testCases := []testMemoryManager{ { description: "Successful creation of Memory Manager instance", - policyName: policyTypeStatic, + policyName: getPolicyNameForOs(), machineInfo: machineInfo, nodeAllocatableReservation: v1.ResourceList{v1.ResourceMemory: *resource.NewQuantity(2*gb, resource.BinarySI)}, systemReservedMemory: []kubeletconfig.MemoryReservation{ @@ -1928,7 +1936,7 @@ func TestNewManager(t *testing.T) { }, { description: "Should return an error when systemReservedMemory (configured with kubelet flag) does not comply with Node Allocatable feature values", - policyName: policyTypeStatic, + policyName: getPolicyNameForOs(), machineInfo: machineInfo, nodeAllocatableReservation: v1.ResourceList{v1.ResourceMemory: *resource.NewQuantity(2*gb, resource.BinarySI)}, systemReservedMemory: []kubeletconfig.MemoryReservation{ @@ -1951,7 +1959,7 @@ func TestNewManager(t *testing.T) { }, { description: "Should return an error when memory reserved for system is empty (systemReservedMemory)", - policyName: policyTypeStatic, + policyName: getPolicyNameForOs(), machineInfo: machineInfo, nodeAllocatableReservation: v1.ResourceList{}, systemReservedMemory: []kubeletconfig.MemoryReservation{},