Merge pull request #5893 from zylxjtu/main

k8s-ci-robot · web-flow · commit e7392a3d8520 · 2025-10-02T14:38:56.000-07:00
check the path before emitting containerd logs from windows node
diff --git a/test/e2e/azure_logcollector.go b/test/e2e/azure_logcollector.go
@@ -494,7 +494,7 @@ func windowsK8sLogs(execToPathFn func(outputFileName string, command string, arg
 		),
 		execToPathFn(
 			"containerd.log",
-			`Get-Content "C:\\var\\log\\containerd\\containerd.log"`,
+			"$p = 'C:\\var\\log\\containerd\\containerd.log' ; if (Test-Path $p) { Get-Content $p } else { Write-Host \"No containerd logs found at $p\" }",
 		),
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ func windowsK8sLogs(execToPathFn func(outputFileName string, command string, arg`
`494`	`494`	`),`
`495`	`495`	`execToPathFn(`
`496`	`496`	`"containerd.log",`
`497`		- `Get-Content "C:\\var\\log\\containerd\\containerd.log"`,
	`497`	`+ "$p = 'C:\\var\\log\\containerd\\containerd.log' ; if (Test-Path $p) { Get-Content $p } else { Write-Host \"No containerd logs found at $p\" }",`
`498`	`498`	`),`
`499`	`499`	`}`
`500`	`500`	`}`