Merge pull request #84600 from jsafrane/e2e-log-initcontainers

Grab init containers logs in e2e tests
This commit is contained in:
Kubernetes Prow Robot 2019-11-06 15:34:03 -08:00 committed by GitHub
commit 7f441dc1c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1137,15 +1137,16 @@ func (f *Framework) MatchContainerOutput(
if podErr != nil { if podErr != nil {
// Pod failed. Dump all logs from all containers to see what's wrong // Pod failed. Dump all logs from all containers to see what's wrong
for _, container := range podStatus.Spec.Containers { _ = podutil.VisitContainers(&podStatus.Spec, func(c *v1.Container) bool {
logs, err := e2epod.GetPodLogs(f.ClientSet, ns, podStatus.Name, container.Name) logs, err := e2epod.GetPodLogs(f.ClientSet, ns, podStatus.Name, c.Name)
if err != nil { if err != nil {
Logf("Failed to get logs from node %q pod %q container %q: %v", Logf("Failed to get logs from node %q pod %q container %q: %v",
podStatus.Spec.NodeName, podStatus.Name, container.Name, err) podStatus.Spec.NodeName, podStatus.Name, c.Name, err)
continue } else {
Logf("Output of node %q pod %q container %q: %s", podStatus.Spec.NodeName, podStatus.Name, c.Name, logs)
} }
Logf("Output of node %q pod %q container %q: %s", podStatus.Spec.NodeName, podStatus.Name, container.Name, logs) return true
} })
return fmt.Errorf("expected pod %q success: %v", createdPod.Name, podErr) return fmt.Errorf("expected pod %q success: %v", createdPod.Name, podErr)
} }