Merge pull request #63563 from filbranden/cgroupname2

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix cgroup names in node_container_manager_test. **What this PR does / why we need it**: 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 ``` **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #63549 **Special notes for your reviewer**: /assign @dashpole **Release note**: ```release-note NONE ```

Merge pull request #63563 from filbranden/cgroupname2
afa43540 · Kubernetes Submit Queue · GitHub · 13f3c7c7 · 48d052fa · afa43540
Unverified Commit afa43540 authored May 08, 2018 by Kubernetes Submit Queue Committed by GitHub May 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

node_container_manager_test.go test/e2e_node/node_container_manager_test.go +3 -3

No files found.
--- 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"
+	kubeReservedCgroup   = "kube-reserved"
-	systemReservedCgroup = "system_reserved"
+	systemReservedCgroup = "system-reserved"
 )
 func createIfNotExists(cm cm.CgroupManager, cgroupConfig *cm.CgroupConfig) error {