mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-30 15:05:27 +00:00
e2e_node: launch kubelet via systemd-run
This more closely mimics what the kubelet will usually have for cgroups, and also fixes an issue with cgroup detection of it. Fixes #26431
This commit is contained in:
parent
c9c4ada309
commit
6303edb790
@ -206,7 +206,17 @@ func (es *e2eService) startKubeletServer() (*exec.Cmd, error) {
|
||||
return nil, err
|
||||
}
|
||||
es.kubeletStaticPodDir = dataDir
|
||||
cmd := exec.Command("sudo", getKubeletServerBin(),
|
||||
cmdArgs := []string{}
|
||||
if systemdRun, err := exec.LookPath("systemd-run"); err == nil {
|
||||
// On systemd services, detection of a service / unit works reliably while
|
||||
// detection of a process started from an ssh session does not work.
|
||||
// Since kubelet will typically be run as a service it also makes more
|
||||
// sense to test it that way
|
||||
cmdArgs = append(cmdArgs, systemdRun, getKubeletServerBin())
|
||||
} else {
|
||||
cmdArgs = append(cmdArgs, getKubeletServerBin())
|
||||
}
|
||||
cmdArgs = append(cmdArgs,
|
||||
"--api-servers", "http://127.0.0.1:8080",
|
||||
"--address", "0.0.0.0",
|
||||
"--port", "10250",
|
||||
@ -218,6 +228,7 @@ func (es *e2eService) startKubeletServer() (*exec.Cmd, error) {
|
||||
"--file-check-frequency", "10s", // Check file frequently so tests won't wait too long
|
||||
"--v", "8", "--logtostderr",
|
||||
)
|
||||
cmd := exec.Command("sudo", cmdArgs...)
|
||||
hcc := newHealthCheckCommand(
|
||||
"http://127.0.0.1:10255/healthz",
|
||||
cmd,
|
||||
|
Loading…
Reference in New Issue
Block a user