Merge pull request kubernetes#128511 from aojea/revert-128508-fix-118141

k8s-ci-robot · web-flow · commit 406fb26628bf · 2024-11-02T14:53:26.000Z
Revert "Don't stop the next poll when it fails to grab logs"
diff --git a/test/e2e/network/dns_common.go b/test/e2e/network/dns_common.go
@@ -509,8 +509,7 @@ func assertFilesContain(ctx context.Context, fileNames []string, fileDir string,
 		for _, container := range pod.Spec.Containers {
 			logs, err := e2epod.GetPodLogs(ctx, client, pod.Namespace, pod.Name, container.Name)
 			if err != nil {
-				framework.Logf("Unable to get logs for %s: %v", container.Name, err)
-				continue
+				return false, fmt.Errorf("unexpected error getting pod client logs for %s: %v", container.Name, err)
 			}
 			framework.Logf("Pod client logs for %s: %s", container.Name, logs)
 		}

Original file line number	Diff line number	Diff line change
`@@ -509,8 +509,7 @@ func assertFilesContain(ctx context.Context, fileNames []string, fileDir string,`
`509`	`509`	`for _, container := range pod.Spec.Containers {`
`510`	`510`	`logs, err := e2epod.GetPodLogs(ctx, client, pod.Namespace, pod.Name, container.Name)`
`511`	`511`	`if err != nil {`
`512`		`- framework.Logf("Unable to get logs for %s: %v", container.Name, err)`
`513`		`- continue`
	`512`	`+ return false, fmt.Errorf("unexpected error getting pod client logs for %s: %v", container.Name, err)`
`514`	`513`	`}`
`515`	`514`	`framework.Logf("Pod client logs for %s: %s", container.Name, logs)`
`516`	`515`	`}`