Merge pull request #45580 from heartlock/cri-logpath

Automatic merge from submit-queue Add LogPath for container status in CRI In order to get log path of container from CRI runtime, we need to add `LogPath` to `ContainerStatus` in CRI. @Random-Liu @feiskyer

Merge pull request #45580 from heartlock/cri-logpath
98b5e9d5 · Kubernetes Submit Queue · GitHub · ce4f010b · 8e702347 · 98b5e9d5
Commit 98b5e9d5 authored May 12, 2017 by Kubernetes Submit Queue Committed by GitHub May 12, 2017
Showing with 3 additions and 0 deletions

api.pb.go pkg/kubelet/apis/cri/v1alpha1/api.pb.go +0 -0

api.proto pkg/kubelet/apis/cri/v1alpha1/api.proto +2 -0

docker_container.go pkg/kubelet/dockershim/docker_container.go +1 -0

No files found.
--- a/pkg/kubelet/apis/cri/v1alpha1/api.pb.go
+++ b/pkg/kubelet/apis/cri/v1alpha1/api.pb.go
--- a/pkg/kubelet/apis/cri/v1alpha1/api.proto
+++ b/pkg/kubelet/apis/cri/v1alpha1/api.proto
@@ -770,6 +770,8 @@ message ContainerStatus {
    map<string,string> annotations = 13;
    // Mounts for the container.
    repeated Mount mounts = 14;
+    // Log path of container.
+    string log_path = 15;
 }

 message ContainerStatusResponse {

--- a/pkg/kubelet/dockershim/docker_container.go
+++ b/pkg/kubelet/dockershim/docker_container.go
@@ -430,5 +430,6 @@ func (ds *dockerService) ContainerStatus(containerID string) (*runtimeapi.Contai
 		Message:     message,
 		Labels:      labels,
 		Annotations: annotations,
+		LogPath:     r.Config.Labels[containerLogPathLabelKey],
 	}, nil
 }