test: fix pod logs dumping (#1954)

Description
Fix error logging in e2e failure dumps by replacing %w with %v in GinkgoWriter.Printf, so runtime logs render correctly instead of %!w(...).
Improve container logging

---------

Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>

Author: universal-itengineer

test/e2e/controller/err_checker.go

@@ -85,7 +85,7 @@ func (l *LogChecker) Start() error {
 				// It should not cause tests to fail.
 				var goAwayError *http2.GoAwayError
 				if errors.As(err, &goAwayError) {
-					ginkgo.GinkgoWriter.Printf("Warning! %w\n", err)
+					ginkgo.GinkgoWriter.Printf("Warning! %v\n", err)
 				} else {
 					l.resultErr = errors.Join(l.resultErr, err)
 				}

test/e2e/internal/framework/dump.go

@@ -30,6 +30,8 @@ import (
 	"github.com/deckhouse/virtualization/test/e2e/internal/kubectl"
 )
 
+const d8vContainerPrefix = "d8v"
+
 // SaveTestCaseDump dump some resources, logs and descriptions that may help in further diagnostic.
 //
 // NOTE: This method is called in AfterEach for failed specs only. Avoid to use Expect,
@@ -89,7 +91,7 @@ func (f *Framework) saveTestCaseResources(testCaseFullText, dumpPath string) {
 		ShowManagedFields: true,
 	})
 	if result.Error() != nil {
-		GinkgoWriter.Printf("Get resources error:\n%s\n%w\n%s\n", result.GetCmd(), result.Error(), result.StdErr())
+		GinkgoWriter.Printf("Get resources error:\n%s\n%v\n%s\n", result.GetCmd(), result.Error(), result.StdErr())
 	}
 
 	// Stdout may present even if error is occurred.
@@ -147,23 +149,42 @@ func (f *Framework) saveIntvirtvmiDescriptions(testCaseFullText, dumpPath string
 }
 
 func (f *Framework) writePodLogs(name, namespace, filePath, testCaseFullText string) {
-	podLogs, err := f.Clients.KubeClient().CoreV1().Pods(namespace).GetLogs(name, &corev1.PodLogOptions{}).Stream(context.Background())
+	pod, err := f.Clients.kubeClient.CoreV1().Pods(namespace).Get(context.Background(), name, metav1.GetOptions{})
+	if err != nil {
+		GinkgoWriter.Printf("Failed to get pod:\nPodName: %s\nError: %v\n", name, err)
+		return
+	}
+
+	for _, container := range pod.Spec.Containers {
+		if !strings.HasPrefix(container.Name, d8vContainerPrefix) {
+			GinkgoWriter.Printf("Skipping container without d8v prefix:\nPodName: %s\nContainer: %s\n", pod.Name, container.Name)
+			continue
+		}
+		f.writePodContainerLogs(pod, container.Name, filePath, testCaseFullText)
+	}
+}
+
+func (f *Framework) writePodContainerLogs(pod *corev1.Pod, containerName, filePath, testCaseFullText string) {
+	podLogs, err := f.Clients.KubeClient().CoreV1().Pods(pod.Namespace).GetLogs(pod.Name,
+		&corev1.PodLogOptions{
+			Container: containerName,
+		}).Stream(context.Background())
 	if err != nil {
-		GinkgoWriter.Printf("Failed to get logs:\nPodName: %s\nError: %w\n", name, err)
+		GinkgoWriter.Printf("Failed to get logs:\nPodName: %s\nContainer: %s\nError: %v\n", pod.Name, containerName, err)
 		return
 	}
 	defer podLogs.Close()
 
 	logs, err := io.ReadAll(podLogs)
 	if err != nil {
-		GinkgoWriter.Printf("Failed to read logs:\nPodName: %s\nError: %w\n", name, err)
+		GinkgoWriter.Printf("Failed to read logs:\nPodName: %s\nContainer: %s\nError: %v\n", pod.Name, containerName, err)
 		return
 	}
 
-	fileName := fmt.Sprintf("%s/e2e_failed__%s__%s__logs.json", filePath, testCaseFullText, name)
+	fileName := fmt.Sprintf("%s/e2e_failed__%s__%s__%s__logs.json", filePath, testCaseFullText, pod.Name, containerName)
 	err = os.WriteFile(fileName, logs, 0o644)
 	if err != nil {
-		GinkgoWriter.Printf("Failed to save logs:\nPodName: %s\nError: %w\n", name, err)
+		GinkgoWriter.Printf("Failed to save logs:\nPodName: %s\nContainer: %s\nError: %v\n", pod.Name, containerName, err)
 	}
 }
 
@@ -176,7 +197,7 @@ func (f *Framework) writePodDescription(name, namespace, filePath, testCaseFullT
 	fileName := fmt.Sprintf("%s/e2e_failed__%s__%s__describe", filePath, testCaseFullText, name)
 	err := os.WriteFile(fileName, describeCmd.StdOutBytes(), 0o644)
 	if err != nil {
-		GinkgoWriter.Printf("Failed to save pod description:\nPodName: %s\nError: %w\n", name, err)
+		GinkgoWriter.Printf("Failed to save pod description:\nPodName: %s\nError: %v\n", name, err)
 	}
 }
 
@@ -191,7 +212,7 @@ func (f *Framework) writeVirtualMachineGuestInfo(pod corev1.Pod, filePath, testC
 			fileName := fmt.Sprintf("%s/e2e_failed__%s__%s__vlctl_guest_info", filePath, testCaseFullText, pod.Name)
 			err := os.WriteFile(fileName, vlctlGuestInfoCmd.StdOutBytes(), 0o644)
 			if err != nil {
-				GinkgoWriter.Printf("Failed to save pod guest info:\nPodName: %s\nError: %w\n", pod.Name, err)
+				GinkgoWriter.Printf("Failed to save pod guest info:\nPodName: %s\nError: %v\n", pod.Name, err)
 			}
 		}
 	}

test/e2e/legacy/util.go

@@ -674,7 +674,7 @@ func SaveTestCaseResources(labels map[string]string, additional, namespace, dump
 		ShowManagedFields: true,
 	})
 	if clusterResourceResult.Error() != nil {
-		GinkgoWriter.Printf("Get resources error:\n%s\n%w\n%s\n", clusterResourceResult.GetCmd(), clusterResourceResult.Error(), clusterResourceResult.StdErr())
+		GinkgoWriter.Printf("Get resources error:\n%s\n%v\n%s\n", clusterResourceResult.GetCmd(), clusterResourceResult.Error(), clusterResourceResult.StdErr())
 	}
 
 	namespacedResourceResult := kubectl.Get("virtualization,intvirt,pod,volumesnapshot,pvc", kc.GetOptions{
@@ -683,7 +683,7 @@ func SaveTestCaseResources(labels map[string]string, additional, namespace, dump
 		ShowManagedFields: true,
 	})
 	if namespacedResourceResult.Error() != nil {
-		GinkgoWriter.Printf("Get resources error:\n%s\n%w\n%s\n", namespacedResourceResult.GetCmd(), namespacedResourceResult.Error(), namespacedResourceResult.StdErr())
+		GinkgoWriter.Printf("Get resources error:\n%s\n%v\n%s\n", namespacedResourceResult.GetCmd(), namespacedResourceResult.Error(), namespacedResourceResult.StdErr())
 	}
 
 	// Stdout may present even if error is occurred.