github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101947 from cynepco3hahue/memory_manager_move_to_beta

Browse Source 
memory manager: move to beta
This commit is contained in:
Kubernetes Prow Robot 2021-06-28 15:38:28 -07:00 committed by GitHub
commit 38f012320f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/features/kube_features.go
View File

@ -125,7 +125,8 @@ const (
TopologyManager featuregate.Feature = "TopologyManager" TopologyManager featuregate.Feature = "TopologyManager"
// owner: @cynepco3hahue(alukiano) @cezaryzukowski @k-wiatrzyk // 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 // Allows setting memory affinity for a container based on NUMA topology
MemoryManager featuregate.Feature = "MemoryManager" MemoryManager featuregate.Feature = "MemoryManager"
@ -736,7 +737,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
ExpandInUsePersistentVolumes: {Default: true, PreRelease: featuregate.Beta}, ExpandInUsePersistentVolumes: {Default: true, PreRelease: featuregate.Beta},
ExpandCSIVolumes: {Default: true, PreRelease: featuregate.Beta}, ExpandCSIVolumes: {Default: true, PreRelease: featuregate.Beta},
CPUManager: {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}, CPUCFSQuotaPeriod: {Default: false, PreRelease: featuregate.Alpha},
TopologyManager: {Default: true, PreRelease: featuregate.Beta}, TopologyManager: {Default: true, PreRelease: featuregate.Beta},
StorageObjectInUseProtection: {Default: true, PreRelease: featuregate.GA}, StorageObjectInUseProtection: {Default: true, PreRelease: featuregate.GA},

6
test/e2e_node/memory_manager_test.go
View File

@ -176,7 +176,6 @@ func getAllocatableMemoryFromStateFile(s *state.MemoryManagerCheckpoint) []state
} }
type kubeletParams struct { type kubeletParams struct {
memoryManagerFeatureGate bool
podResourcesGetAllocatableFeatureGate bool podResourcesGetAllocatableFeatureGate bool
memoryManagerPolicy string memoryManagerPolicy string
systemReservedMemory []kubeletconfig.MemoryReservation systemReservedMemory []kubeletconfig.MemoryReservation
@ -191,7 +190,7 @@ func getUpdatedKubeletConfig(oldCfg *kubeletconfig.KubeletConfiguration, params
if newCfg.FeatureGates == nil { if newCfg.FeatureGates == nil {
newCfg.FeatureGates = map[string]bool{} newCfg.FeatureGates = map[string]bool{}
} }
newCfg.FeatureGates["MemoryManager"] = params.memoryManagerFeatureGate
newCfg.FeatureGates["KubeletPodResourcesGetAllocatable"] = params.podResourcesGetAllocatableFeatureGate newCfg.FeatureGates["KubeletPodResourcesGetAllocatable"] = params.podResourcesGetAllocatableFeatureGate
newCfg.MemoryManagerPolicy = params.memoryManagerPolicy newCfg.MemoryManagerPolicy = params.memoryManagerPolicy
@ -268,7 +267,7 @@ func getAllNUMANodes() []int {
} }
// Serial because the test updates kubelet configuration. // 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 // TODO: add more complex tests that will include interaction between CPUManager, MemoryManager and TopologyManager
var ( var (
allNUMANodes []int allNUMANodes []int
@ -284,7 +283,6 @@ var _ = SIGDescribe("Memory Manager [Serial] [Feature:MemoryManager][NodeAlphaFe
memoryQuantity := resource.MustParse("1100Mi") memoryQuantity := resource.MustParse("1100Mi")
defaultKubeParams := &kubeletParams{ defaultKubeParams := &kubeletParams{
memoryManagerFeatureGate: true,
podResourcesGetAllocatableFeatureGate: true, podResourcesGetAllocatableFeatureGate: true,
systemReservedMemory: []kubeletconfig.MemoryReservation{ systemReservedMemory: []kubeletconfig.MemoryReservation{
{ {