diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 0caa42c9830..7dc63dbe743 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -552,7 +552,7 @@ Runtime log sanitization may introduce significant computation overhead and ther fs.BoolVar(&c.KernelMemcgNotification, "experimental-kernel-memcg-notification", c.KernelMemcgNotification, "Use kernelMemcgNotification configuration, this flag will be removed in 1.23.") // Memory Manager Flags - fs.StringVar(&c.MemoryManagerPolicy, "memory-manager-policy", c.MemoryManagerPolicy, "Memory Manager policy to use. Possible values: 'none', 'static'. Default: 'none'") + fs.StringVar(&c.MemoryManagerPolicy, "memory-manager-policy", c.MemoryManagerPolicy, "Memory Manager policy to use. Possible values: 'None', 'Static'. Default: 'None'") // TODO: once documentation link is available, replace KEP link with the documentation one. fs.Var(&utilflag.ReservedMemoryVar{Value: &c.ReservedMemory}, "reserved-memory", "A comma separated list of memory reservations for NUMA nodes. (e.g. --reserved-memory 0:memory=1Gi,hugepages-1M=2Gi --reserved-memory 1:memory=2Gi). The total sum for each memory type should be equal to the sum of kube-reserved, system-reserved and eviction-threshold. See more details under https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/1769-memory-manager#reserved-memory-flag") } diff --git a/pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/after/v1beta1.yaml b/pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/after/v1beta1.yaml index a945c692e5e..4ebbd726791 100644 --- a/pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/after/v1beta1.yaml +++ b/pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/after/v1beta1.yaml @@ -55,7 +55,7 @@ logging: makeIPTablesUtilChains: true maxOpenFiles: 1000000 maxPods: 110 -memoryManagerPolicy: none +memoryManagerPolicy: None nodeLeaseDurationSeconds: 40 nodeStatusMaxImages: 50 nodeStatusReportFrequency: 5m0s diff --git a/pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/roundtrip/default/v1beta1.yaml b/pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/roundtrip/default/v1beta1.yaml index a945c692e5e..4ebbd726791 100644 --- a/pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/roundtrip/default/v1beta1.yaml +++ b/pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/roundtrip/default/v1beta1.yaml @@ -55,7 +55,7 @@ logging: makeIPTablesUtilChains: true maxOpenFiles: 1000000 maxPods: 110 -memoryManagerPolicy: none +memoryManagerPolicy: None nodeLeaseDurationSeconds: 40 nodeStatusMaxImages: 50 nodeStatusReportFrequency: 5m0s diff --git a/pkg/kubelet/cm/memorymanager/policy_none.go b/pkg/kubelet/cm/memorymanager/policy_none.go index a8b6b778520..8df7bdb0dad 100644 --- a/pkg/kubelet/cm/memorymanager/policy_none.go +++ b/pkg/kubelet/cm/memorymanager/policy_none.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" ) -const policyTypeNone policyType = "none" +const policyTypeNone policyType = "None" // none is implementation of the policy interface for the none policy, using none // policy is the same as disable memory management diff --git a/pkg/kubelet/cm/memorymanager/policy_static.go b/pkg/kubelet/cm/memorymanager/policy_static.go index 2da2ecd4c6b..f6ad0b5fcc2 100644 --- a/pkg/kubelet/cm/memorymanager/policy_static.go +++ b/pkg/kubelet/cm/memorymanager/policy_static.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask" ) -const policyTypeStatic policyType = "static" +const policyTypeStatic policyType = "Static" type systemReservedMemory map[int]map[v1.ResourceName]uint64 diff --git a/staging/src/k8s.io/kubelet/config/v1beta1/types.go b/staging/src/k8s.io/kubelet/config/v1beta1/types.go index 4ae08f27c4b..1c009b96eaa 100644 --- a/staging/src/k8s.io/kubelet/config/v1beta1/types.go +++ b/staging/src/k8s.io/kubelet/config/v1beta1/types.go @@ -75,11 +75,11 @@ const ( PodTopologyManagerScope = "pod" // NoneMemoryManagerPolicy is a memory manager none policy, under the none policy // the memory manager will not pin containers memory of guaranteed pods - NoneMemoryManagerPolicy = "none" + NoneMemoryManagerPolicy = "None" // StaticMemoryManagerPolicy is a memory manager static policy, under the static policy // the memory manager will try to pin containers memory of guaranteed pods to the smallest // possible sub-set of NUMA nodes - StaticMemoryManagerPolicy = "static" + StaticMemoryManagerPolicy = "Static" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object @@ -430,7 +430,7 @@ type KubeletConfiguration struct { // Requires the CPUManager feature gate to be enabled. // Dynamic Kubelet Config (beta): This field should not be updated without a full node // reboot. It is safest to keep this value the same as the local config. - // Default: "none" + // Default: "None" // +optional CPUManagerPolicy string `json:"cpuManagerPolicy,omitempty"` // CPU Manager reconciliation period. diff --git a/test/e2e_node/memory_manager_test.go b/test/e2e_node/memory_manager_test.go index d25565f80a8..c92a16f7eee 100644 --- a/test/e2e_node/memory_manager_test.go +++ b/test/e2e_node/memory_manager_test.go @@ -47,8 +47,8 @@ const ( evictionHardMemory = "memory.available" memoryManagerStateFile = "/var/lib/kubelet/memory_manager_state" resourceMemory = "memory" - staticPolicy = "static" - nonePolicy = "none" + staticPolicy = "Static" + nonePolicy = "None" ) // Helper for makeMemoryManagerPod().