Merge pull request #2065 from JoshVanL/e2e-include-logs-previous

Include previous logs and use all containers from pods

test/e2e/framework/addon/chart/addon.go

@@ -265,25 +265,33 @@ func (c *Chart) Logs() (map[string]string, error) {
 
 	out := make(map[string]string)
 	for _, pod := range podList {
-		// Only grab logs from the first container in the pod
-		// TODO: grab logs from all containers
-		containerName := pod.Spec.Containers[0].Name
-		resp := kc.CoreV1().Pods(pod.Namespace).GetLogs(pod.Name, &corev1.PodLogOptions{
-			Container: containerName,
-		}).Do()
-
-		err := resp.Error()
-		if err != nil {
-			continue
+		for _, con := range pod.Spec.Containers {
+			for _, b := range []bool{true, false} {
+				resp := kc.CoreV1().Pods(pod.Namespace).GetLogs(pod.Name, &corev1.PodLogOptions{
+					Container: con.Name,
+					Previous:  b,
+				}).Do()
+
+				err := resp.Error()
+				if err != nil {
+					continue
+				}
+
+				logs, err := resp.Raw()
+				if err != nil {
+					continue
+				}
+
+				outPath := path.Join(c.Namespace,
+					fmt.Sprintf("%s-%s", pod.Name, con.Name))
+
+				if b {
+					outPath = fmt.Sprintf("%s-previous", outPath)
+				}
+
+				out[outPath] = string(logs)
+			}
 		}
-
-		logs, err := resp.Raw()
-		if err != nil {
-			continue
-		}
-
-		outPath := path.Join(c.Namespace, pod.Name)
-		out[outPath] = string(logs)
 	}
 
 	return out, nil