github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename log-dump env to `LOG_DUMP_SYSTEMD_SERVICES`.

pull/6/head
Lantao Liu 2017-11-16 00:41:27 +00:00
parent a3bfe65d86
commit 0085e2208d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/log-dump/log-dump.sh
View File

@ -50,7 +50,7 @@ readonly gce_logfiles="startupscript"
readonly kern_logfile="kern" readonly kern_logfile="kern"
readonly initd_logfiles="docker" readonly initd_logfiles="docker"
readonly supervisord_logfiles="kubelet supervisor/supervisord supervisor/kubelet-stdout supervisor/kubelet-stderr supervisor/docker-stdout supervisor/docker-stderr" readonly supervisord_logfiles="kubelet supervisor/supervisord supervisor/kubelet-stdout supervisor/kubelet-stderr supervisor/docker-stdout supervisor/docker-stderr"
readonly systemd_services="kubelet ${SYSTEMD_SERVICES:-docker}" readonly systemd_services="kubelet ${LOG_DUMP_SYSTEMD_SERVICES:-docker}"
# Limit the number of concurrent node connections so that we don't run out of # Limit the number of concurrent node connections so that we don't run out of
# file descriptors for large clusters. # file descriptors for large clusters.

2
test/e2e/framework/util.go
View File

@ -4573,7 +4573,7 @@ func CoreDump(dir string) {
Logf("Dumping logs locally to: %s", dir) Logf("Dumping logs locally to: %s", dir)
cmd = exec.Command(path.Join(TestContext.RepoRoot, "cluster", "log-dump", "log-dump.sh"), dir) cmd = exec.Command(path.Join(TestContext.RepoRoot, "cluster", "log-dump", "log-dump.sh"), dir)
} }
cmd.Env = append(os.Environ(), fmt.Sprintf("SYSTEMD_SERVICES=%s", parseSystemdServices(TestContext.SystemdServices))) cmd.Env = append(os.Environ(), fmt.Sprintf("LOG_DUMP_SYSTEMD_SERVICES=%s", parseSystemdServices(TestContext.SystemdServices)))
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {