upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-08 16:30:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #138006 from tallclair/push-kooxxktxovkr

Browse source 
Flaky test fix for 'should restart failing container when pod restartPolicy is Always'
This commit is contained in:
Kubernetes Prow Robot 2026-03-25 02:18:16 +05:30 committed by GitHub
commit 473b7635de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/e2e_node/container_lifecycle_pod_construction.go
View file

@ -329,11 +329,15 @@ func parseOutput(ctx context.Context, f *framework.Framework, pod *v1.Pod) conta
var buf bytes.Buffer
for _, cs := range statuses {
log, err := e2epod.GetPodLogs(ctx, f.ClientSet, f.Namespace.Name, pod.Name, cs.Name)
if err != nil {
framework.Logf("error getting logs for %s: %v", cs.Name, err)
log, err = e2epod.GetPreviousPodLogs(ctx, f.ClientSet, f.Namespace.Name, pod.Name, cs.Name)
if err != nil || log == "" {
if err != nil {
framework.Logf("error getting previous logs for %s: %v", cs.Name, err)
framework.Logf("error getting logs for %s: %v", cs.Name, err)
}
prevLog, prevErr := e2epod.GetPreviousPodLogs(ctx, f.ClientSet, f.Namespace.Name, pod.Name, cs.Name)
if prevErr != nil {
framework.Logf("error getting previous logs for %s: %v", cs.Name, prevErr)
} else {
log = prevLog
}
}
buf.WriteString(log)