diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 853388e4d14..b4de90a6ef7 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -125,7 +125,8 @@ const ( TopologyManager featuregate.Feature = "TopologyManager" // owner: @cynepco3hahue(alukiano) @cezaryzukowski @k-wiatrzyk - // alpha:: v1.20 + // alpha: v1.21 + // beta: v1.22 // Allows setting memory affinity for a container based on NUMA topology MemoryManager featuregate.Feature = "MemoryManager" @@ -736,7 +737,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS ExpandInUsePersistentVolumes: {Default: true, PreRelease: featuregate.Beta}, ExpandCSIVolumes: {Default: true, PreRelease: featuregate.Beta}, CPUManager: {Default: true, PreRelease: featuregate.Beta}, - MemoryManager: {Default: false, PreRelease: featuregate.Alpha}, + MemoryManager: {Default: true, PreRelease: featuregate.Beta}, CPUCFSQuotaPeriod: {Default: false, PreRelease: featuregate.Alpha}, TopologyManager: {Default: true, PreRelease: featuregate.Beta}, StorageObjectInUseProtection: {Default: true, PreRelease: featuregate.GA}, diff --git a/test/e2e_node/memory_manager_test.go b/test/e2e_node/memory_manager_test.go index d098d10b356..82ce1330366 100644 --- a/test/e2e_node/memory_manager_test.go +++ b/test/e2e_node/memory_manager_test.go @@ -176,7 +176,6 @@ func getAllocatableMemoryFromStateFile(s *state.MemoryManagerCheckpoint) []state } type kubeletParams struct { - memoryManagerFeatureGate bool podResourcesGetAllocatableFeatureGate bool memoryManagerPolicy string systemReservedMemory []kubeletconfig.MemoryReservation @@ -191,7 +190,7 @@ func getUpdatedKubeletConfig(oldCfg *kubeletconfig.KubeletConfiguration, params if newCfg.FeatureGates == nil { newCfg.FeatureGates = map[string]bool{} } - newCfg.FeatureGates["MemoryManager"] = params.memoryManagerFeatureGate + newCfg.FeatureGates["KubeletPodResourcesGetAllocatable"] = params.podResourcesGetAllocatableFeatureGate newCfg.MemoryManagerPolicy = params.memoryManagerPolicy @@ -268,7 +267,7 @@ func getAllNUMANodes() []int { } // Serial because the test updates kubelet configuration. -var _ = SIGDescribe("Memory Manager [Serial] [Feature:MemoryManager][NodeAlphaFeature:MemoryManager]", func() { +var _ = SIGDescribe("Memory Manager [Serial] [Feature:MemoryManager]", func() { // TODO: add more complex tests that will include interaction between CPUManager, MemoryManager and TopologyManager var ( allNUMANodes []int @@ -284,7 +283,6 @@ var _ = SIGDescribe("Memory Manager [Serial] [Feature:MemoryManager][NodeAlphaFe memoryQuantity := resource.MustParse("1100Mi") defaultKubeParams := &kubeletParams{ - memoryManagerFeatureGate: true, podResourcesGetAllocatableFeatureGate: true, systemReservedMemory: []kubeletconfig.MemoryReservation{ {