mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #102395 from odinuge/node_container_manager_test_skip_systemd
Skip node container manager test on systemd
This commit is contained in:
commit
b55c980279
@ -34,6 +34,7 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/kubelet/cm"
|
"k8s.io/kubernetes/pkg/kubelet/cm"
|
||||||
"k8s.io/kubernetes/pkg/kubelet/stats/pidlimit"
|
"k8s.io/kubernetes/pkg/kubelet/stats/pidlimit"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
|
||||||
|
|
||||||
"github.com/onsi/ginkgo"
|
"github.com/onsi/ginkgo"
|
||||||
"github.com/onsi/gomega"
|
"github.com/onsi/gomega"
|
||||||
@ -166,6 +167,15 @@ func runTest(f *framework.Framework) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Test needs to be updated to make it run properly on systemd.
|
||||||
|
// In its current state it will result in kubelet error since
|
||||||
|
// kubeReservedCgroup and systemReservedCgroup are not configured
|
||||||
|
// correctly for systemd.
|
||||||
|
// See: https://github.com/kubernetes/kubernetes/issues/102394
|
||||||
|
if oldCfg.CgroupDriver == "systemd" {
|
||||||
|
e2eskipper.Skipf("unable to run test when using systemd as cgroup driver")
|
||||||
|
}
|
||||||
|
|
||||||
// Create a cgroup manager object for manipulating cgroups.
|
// Create a cgroup manager object for manipulating cgroups.
|
||||||
cgroupManager := cm.NewCgroupManager(subsystems, oldCfg.CgroupDriver)
|
cgroupManager := cm.NewCgroupManager(subsystems, oldCfg.CgroupDriver)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user