github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memory manager: update API constant to have camel case format

Browse Source 
Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
This commit is contained in:
Artyom Lukianov 2020-11-18 01:25:13 +02:00
parent e8ea461bfd
commit 932134034c
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubelet/app/options/options.go
View File

@ -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.") fs.BoolVar(&c.KernelMemcgNotification, "experimental-kernel-memcg-notification", c.KernelMemcgNotification, "Use kernelMemcgNotification configuration, this flag will be removed in 1.23.")
// Memory Manager Flags // 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. // 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") 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")
} }

2
pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/after/v1beta1.yaml vendored
View File

@ -55,7 +55,7 @@ logging:
makeIPTablesUtilChains: true makeIPTablesUtilChains: true
maxOpenFiles: 1000000 maxOpenFiles: 1000000
maxPods: 110 maxPods: 110
memoryManagerPolicy: none memoryManagerPolicy: None
nodeLeaseDurationSeconds: 40 nodeLeaseDurationSeconds: 40
nodeStatusMaxImages: 50 nodeStatusMaxImages: 50
nodeStatusReportFrequency: 5m0s nodeStatusReportFrequency: 5m0s

2
pkg/kubelet/apis/config/scheme/testdata/KubeletConfiguration/roundtrip/default/v1beta1.yaml vendored
View File

@ -55,7 +55,7 @@ logging:
makeIPTablesUtilChains: true makeIPTablesUtilChains: true
maxOpenFiles: 1000000 maxOpenFiles: 1000000
maxPods: 110 maxPods: 110
memoryManagerPolicy: none memoryManagerPolicy: None
nodeLeaseDurationSeconds: 40 nodeLeaseDurationSeconds: 40
nodeStatusMaxImages: 50 nodeStatusMaxImages: 50
nodeStatusReportFrequency: 5m0s nodeStatusReportFrequency: 5m0s

2
pkg/kubelet/cm/memorymanager/policy_none.go
View File

@ -22,7 +22,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" "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 // none is implementation of the policy interface for the none policy, using none
// policy is the same as disable memory management // policy is the same as disable memory management

2
pkg/kubelet/cm/memorymanager/policy_static.go
View File

@ -33,7 +33,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask"
) )
const policyTypeStatic policyType = "static" const policyTypeStatic policyType = "Static"
type systemReservedMemory map[int]map[v1.ResourceName]uint64 type systemReservedMemory map[int]map[v1.ResourceName]uint64

6
staging/src/k8s.io/kubelet/config/v1beta1/types.go
View File

@ -75,11 +75,11 @@ const (
PodTopologyManagerScope = "pod" PodTopologyManagerScope = "pod"
// NoneMemoryManagerPolicy is a memory manager none policy, under the none policy // NoneMemoryManagerPolicy is a memory manager none policy, under the none policy
// the memory manager will not pin containers memory of guaranteed pods // 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 // 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 // the memory manager will try to pin containers memory of guaranteed pods to the smallest
// possible sub-set of NUMA nodes // possible sub-set of NUMA nodes
StaticMemoryManagerPolicy = "static" StaticMemoryManagerPolicy = "Static"
) )
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +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. // Requires the CPUManager feature gate to be enabled.
// Dynamic Kubelet Config (beta): This field should not be updated without a full node // 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. // reboot. It is safest to keep this value the same as the local config.
// Default: "none" // Default: "None"
// +optional // +optional
CPUManagerPolicy string `json:"cpuManagerPolicy,omitempty"` CPUManagerPolicy string `json:"cpuManagerPolicy,omitempty"`
// CPU Manager reconciliation period. // CPU Manager reconciliation period.

4
test/e2e_node/memory_manager_test.go
View File

@ -47,8 +47,8 @@ const (
evictionHardMemory = "memory.available" evictionHardMemory = "memory.available"
memoryManagerStateFile = "/var/lib/kubelet/memory_manager_state" memoryManagerStateFile = "/var/lib/kubelet/memory_manager_state"
resourceMemory = "memory" resourceMemory = "memory"
staticPolicy = "static" staticPolicy = "Static"
nonePolicy = "none" nonePolicy = "None"
) )
// Helper for makeMemoryManagerPod(). // Helper for makeMemoryManagerPod().