github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

e2e_node: update node cgroup manager test to verify kubelet recreates kubepods cgroup

Browse Source 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
This commit is contained in:
Peter Hunt
2024-08-08 16:44:08 -04:00
parent dd2dcc0b0a
commit c7b7ea0514
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/e2e_node/node_container_manager_test.go
View File

@@ -120,8 +120,9 @@ func getAllocatableLimits(cpu, memory, pids string, capacity v1.ResourceList) (*
}
const (
kubeReservedCgroup = "kube-reserved"
systemReservedCgroup = "system-reserved"
kubeReservedCgroup = "kube-reserved"
systemReservedCgroup = "system-reserved"
nodeAllocatableCgroup = "kubepods"
)
func createIfNotExists(cm cm.CgroupManager, cgroupConfig *cm.CgroupConfig) error {
@@ -219,6 +220,18 @@ func runTest(ctx context.Context, f *framework.Framework) error {
return kubeletHealthCheck(kubeletHealthCheckURL)
}, time.Minute, time.Second).Should(gomega.BeFalse())
expectedNAPodCgroup := cm.NewCgroupName(cm.RootCgroupName, nodeAllocatableCgroup)
// Cleanup from the previous kubelet, to verify the new one creates it correctly
if err := cgroupManager.Destroy(&cm.CgroupConfig{
Name: cm.NewCgroupName(expectedNAPodCgroup),
}); err != nil {
return err
}
if cgroupManager.Exists(expectedNAPodCgroup) {
return fmt.Errorf("Expected Node Allocatable Cgroup %q not to exist", expectedNAPodCgroup)
}
framework.ExpectNoError(e2enodekubelet.WriteKubeletConfigFile(newCfg))
ginkgo.By("Starting the kubelet")
@@ -235,10 +248,8 @@ func runTest(ctx context.Context, f *framework.Framework) error {
// Set new config and current config.
currentConfig := newCfg
expectedNAPodCgroup := cm.ParseCgroupfsToCgroupName(currentConfig.CgroupRoot)
expectedNAPodCgroup = cm.NewCgroupName(expectedNAPodCgroup, "kubepods")
if !cgroupManager.Exists(expectedNAPodCgroup) {
return fmt.Errorf("Expected Node Allocatable Cgroup %q does not exist", expectedNAPodCgroup)
return fmt.Errorf("Expected Node Allocatable Cgroup %q to exist", expectedNAPodCgroup)
}
memoryLimitFile := "memory.limit_in_bytes"
@@ -256,9 +267,9 @@ func runTest(ctx context.Context, f *framework.Framework) error {
if len(nodeList.Items) != 1 {
return fmt.Errorf("Unexpected number of node objects for node e2e. Expects only one node: %+v", nodeList)
}
cgroupName := "kubepods"
cgroupName := nodeAllocatableCgroup
if currentConfig.CgroupDriver == "systemd" {
cgroupName = "kubepods.slice"
cgroupName = nodeAllocatableCgroup + ".slice"
}
node := nodeList.Items[0]