From 2d4067f1fd71fa4fd7122443e3b138d7ca551499 Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Sat, 16 May 2015 19:19:09 +0100 Subject: [PATCH] Fixes #8374: Underscore separator in docker log symlink --- pkg/kubelet/dockertools/manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index 1b0bf404f6..3912d36750 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -1222,7 +1222,7 @@ func (dm *DockerManager) runContainerInPod(pod *api.Pod, container *api.Containe // labels for Cloud Logging. podFullName := kubecontainer.GetPodFullName(pod) containerLogFile := path.Join(dm.dockerRoot, "containers", id, fmt.Sprintf("%s-json.log", id)) - symlinkFile := path.Join(dm.containerLogsDir, fmt.Sprintf("%s-%s-%s.log", podFullName, container.Name, id)) + symlinkFile := path.Join(dm.containerLogsDir, fmt.Sprintf("%s_%s-%s.log", podFullName, container.Name, id)) if err = dm.os.Symlink(containerLogFile, symlinkFile); err != nil { glog.Errorf("Failed to create symbolic link to the log file of pod %q container %q: %v", podFullName, container.Name, err) }