Merge pull request #55831 from Random-Liu/rename-log-dump-env

Automatic merge from submit-queue (batch tested with PRs 55392, 55491, 51914, 55831, 55836). 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>. Rename log-dump env to `LOG_DUMP_SYSTEMD_SERVICES`. For https://github.com/kubernetes/features/issues/286. Rename `SYSTEMD_SERVICES` to `LOG_DUMP_SYSTEMD_SERVICES`. test-infra disables log dump in our e2e framework, and uses a different log dump logic https://github.com/kubernetes/test-infra/blob/master/kubetest/e2e.go#L480-L497. So the flags we added in https://github.com/kubernetes/kubernetes/pull/55288 will not work in test-infra. Fortrunately, test-infra is using the same script `cluster/log-dump/log-dump.sh`, so we could still configure systemd services by setting the environment variable globally. The original environment variable name is too general for setting globally, change it to a more specific name. **Release note**: ```release-note none ```

Merge pull request #55831 from Random-Liu/rename-log-dump-env
ebd3d680 · Kubernetes Submit Queue · GitHub · 79c22745 · 0085e220 · ebd3d680
Unverified Commit ebd3d680 authored Nov 17, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

log-dump.sh cluster/log-dump/log-dump.sh +1 -1

util.go test/e2e/framework/util.go +1 -1

No files found.
--- a/cluster/log-dump/log-dump.sh
+++ b/cluster/log-dump/log-dump.sh
@@ -50,7 +50,7 @@ readonly gce_logfiles="startupscript"
 readonly kern_logfile="kern"
 readonly initd_logfiles="docker"
 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
 # file descriptors for large clusters.

--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -4575,7 +4575,7 @@ func CoreDump(dir string) {
 		Logf("Dumping logs locally to: %s", 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.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {