From e9edfbc539e7ae7e4b98b043be86dfd83531b7b8 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 13 Nov 2019 10:43:55 +0800 Subject: [PATCH] modify dockerID to containerID --- pkg/kubelet/kuberuntime/legacy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/kuberuntime/legacy.go b/pkg/kubelet/kuberuntime/legacy.go index 1a77e6f0c8d..ae208a01a20 100644 --- a/pkg/kubelet/kuberuntime/legacy.go +++ b/pkg/kubelet/kuberuntime/legacy.go @@ -44,9 +44,9 @@ func legacyLogSymlink(containerID string, containerName, podName, podNamespace s containerName, containerID) } -func logSymlink(containerLogsDir, podFullName, containerName, dockerID string) string { +func logSymlink(containerLogsDir, podFullName, containerName, containerID string) string { suffix := fmt.Sprintf(".%s", legacyLogSuffix) - logPath := fmt.Sprintf("%s_%s-%s", podFullName, containerName, dockerID) + logPath := fmt.Sprintf("%s_%s-%s", podFullName, containerName, containerID) // Length of a filename cannot exceed 255 characters in ext4 on Linux. if len(logPath) > ext4MaxFileNameLen-len(suffix) { logPath = logPath[:ext4MaxFileNameLen-len(suffix)]