Skip to content

K
k3s
Commit 98b5e9d5 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents ce4f010b 8e702347
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
pkg/kubelet/apis/cri/v1alpha1/api.proto
View file @ 98b5e9d5
...@@ -770,6 +770,8 @@ message ContainerStatus { ...@@ -770,6 +770,8 @@ message ContainerStatus {
map<string,string> annotations = 13; map<string,string> annotations = 13;
// Mounts for the container. // Mounts for the container.
repeated Mount mounts = 14; repeated Mount mounts = 14;
// Log path of container.
string log_path = 15;
} }
message ContainerStatusResponse { message ContainerStatusResponse {
......
pkg/kubelet/dockershim/docker_container.go
View file @ 98b5e9d5
...@@ -430,5 +430,6 @@ func (ds *dockerService) ContainerStatus(containerID string) (*runtimeapi.Contai ...@@ -430,5 +430,6 @@ func (ds *dockerService) ContainerStatus(containerID string) (*runtimeapi.Contai
Message: message, Message: message,
Labels: labels, Labels: labels,
Annotations: annotations, Annotations: annotations,
LogPath: r.Config.Labels[containerLogPathLabelKey],
}, nil }, nil
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment