github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85170 from timyinshi/logSymlink

Browse Source 
modify dockerID to containerID
This commit is contained in:
Kubernetes Prow Robot 2019-12-06 14:27:35 -08:00 committed by GitHub
commit c9f690d418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kuberuntime/legacy.go
View File

@ -44,9 +44,9 @@ func legacyLogSymlink(containerID string, containerName, podName, podNamespace s
containerName, containerID) containerName, containerID)
} }
func logSymlink(containerLogsDir, podFullName, containerName, dockerID string) string { func logSymlink(containerLogsDir, podFullName, containerName, containerID string) string {
suffix := fmt.Sprintf(".%s", legacyLogSuffix) 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. // Length of a filename cannot exceed 255 characters in ext4 on Linux.
if len(logPath) > ext4MaxFileNameLen-len(suffix) { if len(logPath) > ext4MaxFileNameLen-len(suffix) {
logPath = logPath[:ext4MaxFileNameLen-len(suffix)] logPath = logPath[:ext4MaxFileNameLen-len(suffix)]