Merge pull request #66096 from feiskyer/automated-cherry-pick-of-#63268-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #63268: Make kubelet `ReadLogs` backward compatible. Cherry pick of #63268 on release-1.10. #63268: Make kubelet `ReadLogs` backward compatible. ```release-note Make kubelet ReadLogs backward compatible. ```

Merge pull request #66096 from feiskyer/automated-cherry-pick-of-#63268-upstream-release-1.10
c838d0ac · Kubernetes Submit Queue · GitHub · f7f48f22 · d0d75ce6 · c838d0ac
Unverified Commit c838d0ac authored Jul 13, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 13, 2018
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

kuberuntime_container.go pkg/kubelet/kuberuntime/kuberuntime_container.go +1 -4

No files found.
--- a/pkg/kubelet/kuberuntime/kuberuntime_container.go
+++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go
@@ -730,10 +730,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.