Merge pull request #88228 from pohly/node-podlog

podlogs: include node name in prefix
This commit is contained in:
Kubernetes Prow Robot 2020-02-19 03:28:25 -08:00 committed by GitHub
commit 507a2decf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -124,7 +124,11 @@ func CopyAllLogs(ctx context.Context, cs clientset.Interface, ns string, to LogO
var prefix string
if to.LogWriter != nil {
out = to.LogWriter
prefix = name + ": "
nodeName := pod.Spec.NodeName
if len(nodeName) > 10 {
nodeName = nodeName[0:4] + ".." + nodeName[len(nodeName)-4:]
}
prefix = name + "@" + nodeName + ": "
} else {
var err error
filename := to.LogPathPrefix + pod.ObjectMeta.Name + "-" + c.Name + ".log"