Merge pull request #30467 from vishh/cloud-init-logs

Automatic merge from submit-queue Collect cloud-init logs Fixes #30411  --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30467)

Merge pull request #30467 from vishh/cloud-init-logs
6aaa5292 · Kubernetes Submit Queue · GitHub · f1639bee · 089439c3 · 6aaa5292
Commit 6aaa5292 authored Aug 11, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

e2e_service.go test/e2e_node/e2e_service.go +3 -2

No files found.
--- a/test/e2e_node/e2e_service.go
+++ b/test/e2e_node/e2e_service.go
@@ -66,8 +66,9 @@ const (
 func newE2eService(nodeName string, cgroupsPerQOS bool, evictionHard string, context *SharedContext) *e2eService {
 	// Special log files that need to be collected for additional debugging.
 	var logFiles = map[string]logFileData{
-		"kern.log":   {[]string{"/var/log/kern.log"}, []string{"-k"}},
-		"docker.log": {[]string{"/var/log/docker.log", "/var/log/upstart/docker.log"}, []string{"-u", "docker"}},
+		"kern.log":       {[]string{"/var/log/kern.log"}, []string{"-k"}},
+		"docker.log":     {[]string{"/var/log/docker.log", "/var/log/upstart/docker.log"}, []string{"-u", "docker"}},
+		"cloud-init.log": {[]string{"/var/log/cloud-init.log"}, []string{"-u", "cloud*"}},
 	}

 	return &e2eService{