From 4bb16659eefe810abec98304ce31dc40274bb1c9 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Fri, 27 Apr 2018 16:03:29 -0700 Subject: [PATCH] Make kubelet `ReadLogs` backward compatible. Signed-off-by: Lantao Liu --- pkg/kubelet/kuberuntime/kuberuntime_container.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go index bf882a84f4..4f2444dd82 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go @@ -736,10 +736,7 @@ func (m *kubeGenericRuntimeManager) GetContainerLogs(pod *v1.Pod, containerID ku glog.V(4).Infof("failed to get container status for %v: %v", containerID.String(), err) return fmt.Errorf("Unable to retrieve container logs for %v", containerID.String()) } - labeledInfo := getContainerInfoFromLabels(status.Labels) - annotatedInfo := getContainerInfoFromAnnotations(status.Annotations) - path := buildFullContainerLogsPath(pod.UID, labeledInfo.ContainerName, annotatedInfo.RestartCount) - return m.ReadLogs(path, containerID.ID, logOptions, stdout, stderr) + return m.ReadLogs(status.GetLogPath(), containerID.ID, logOptions, stdout, stderr) } // GetExec gets the endpoint the runtime will serve the exec request from.