From 48d052fae4da6ce6966134cbe9914acb1f43a214 Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Tue, 8 May 2018 16:15:26 -0700 Subject: [PATCH] Fix cgroup names in node_container_manager_test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- test/e2e_node/node_container_manager_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e_node/node_container_manager_test.go b/test/e2e_node/node_container_manager_test.go index c1bf7e2dce0..09e6dfad41d 100644 --- a/test/e2e_node/node_container_manager_test.go +++ b/test/e2e_node/node_container_manager_test.go @@ -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 {