Skip to content

K
k3s
Commit 48d052fa authored by Filipe Brandenburger's avatar Filipe Brandenburger
Browse files
Options

Fix cgroup names in node_container_manager_test.

The names were made invalid for the CgroupName refactor in #62541, so update them here. Furthermore, as the new names are now compatible with what EnforceNodeAllocatable wants, reuse the constants there as well. Tested: $ make test-e2e-node REMOTE=true HOSTS=test-cos-beta-67-10575-27-0 FOCUS='Validate Node Allocatable' SKIP='' TEST_ARGS='--feature-gates=DynamicKubeletConfig=true' • [SLOW TEST:39.488 seconds] [k8s.io] Node Container Manager [Serial] Validate Node Allocatable set's up the node and runs the test Ran 1 of 261 Specs in 57.348 seconds SUCCESS! -- 1 Passed | 0 Failed | 0 Pending | 260 Skipped
parent f13fa1e3
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
test/e2e_node/node_container_manager_test.go
View file @ 48d052fa
......@@ -38,7 +38,7 @@ import (
)
func setDesiredConfiguration(initialConfig *kubeletconfig.KubeletConfiguration) {
initialConfig.EnforceNodeAllocatable = []string{"pods", "kube-reserved", "system-reserved"}
initialConfig.EnforceNodeAllocatable = []string{"pods", kubeReservedCgroup, systemReservedCgroup}
initialConfig.SystemReserved = map[string]string{
string(v1.ResourceCPU): "100m",
string(v1.ResourceMemory): "100Mi",
......@@ -98,8 +98,8 @@ func getAllocatableLimits(cpu, memory string, capacity v1.ResourceList) (*resour
}
const (
kubeReservedCgroup = "kube_reserved"
systemReservedCgroup = "system_reserved"
kubeReservedCgroup = "kube-reserved"
systemReservedCgroup = "system-reserved"
)
func createIfNotExists(cm cm.CgroupManager, cgroupConfig *cm.CgroupConfig) error {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment