github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #62015 from feiskyer/container-log

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 63603, 63557, 62015). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

CRI: update documents for container logpath

**What this PR does / why we need it**:

The container log path has been changed from  `containername_attempt#.log` to `containername/attempt#.log` in #59906. This PR updates CRI documents for it.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
CRI: update documents for container logpath. The container log path has been changed from containername_attempt#.log to containername/attempt#.log 
```
This commit is contained in:
Kubernetes Submit Queue
2018-05-15 02:07:44 -07:00
committed by GitHub
parent 6aa6051fab 038af53c5a
commit b71966acea
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/apis/cri/runtime/v1alpha2/api.pb.go
View File

@@ -744,7 +744,7 @@ type PodSandboxConfig struct {
// structured logs, systemd-journald journal files, gRPC trace files, etc. // structured logs, systemd-journald journal files, gRPC trace files, etc.
// E.g., // E.g.,
// PodSandboxConfig.LogDirectory = `/var/log/pods/<podUID>/` // PodSandboxConfig.LogDirectory = `/var/log/pods/<podUID>/`
// ContainerConfig.LogPath = `containerName_Instance#.log` // ContainerConfig.LogPath = `containerName/Instance#.log`
// //
// WARNING: Log management and how kubelet should interface with the // WARNING: Log management and how kubelet should interface with the
// container logs are under active discussion in // container logs are under active discussion in
@@ -1790,7 +1790,7 @@ type ContainerConfig struct {
// the log (STDOUT and STDERR) on the host. // the log (STDOUT and STDERR) on the host.
// E.g., // E.g.,
// PodSandboxConfig.LogDirectory = `/var/log/pods/<podUID>/` // PodSandboxConfig.LogDirectory = `/var/log/pods/<podUID>/`
// ContainerConfig.LogPath = `containerName_Instance#.log` // ContainerConfig.LogPath = `containerName/Instance#.log`
// //
// WARNING: Log management and how kubelet should interface with the // WARNING: Log management and how kubelet should interface with the
// container logs are under active discussion in // container logs are under active discussion in

4
pkg/kubelet/apis/cri/runtime/v1alpha2/api.proto
View File

@@ -307,7 +307,7 @@ message PodSandboxConfig {
// structured logs, systemd-journald journal files, gRPC trace files, etc. // structured logs, systemd-journald journal files, gRPC trace files, etc.
// E.g., // E.g.,
// PodSandboxConfig.LogDirectory = `/var/log/pods/<podUID>/` // PodSandboxConfig.LogDirectory = `/var/log/pods/<podUID>/`
// ContainerConfig.LogPath = `containerName_Instance#.log` // ContainerConfig.LogPath = `containerName/Instance#.log`
// //
// WARNING: Log management and how kubelet should interface with the // WARNING: Log management and how kubelet should interface with the
// container logs are under active discussion in // container logs are under active discussion in
@@ -686,7 +686,7 @@ message ContainerConfig {
// the log (STDOUT and STDERR) on the host. // the log (STDOUT and STDERR) on the host.
// E.g., // E.g.,
// PodSandboxConfig.LogDirectory = `/var/log/pods/<podUID>/` // PodSandboxConfig.LogDirectory = `/var/log/pods/<podUID>/`
// ContainerConfig.LogPath = `containerName_Instance#.log` // ContainerConfig.LogPath = `containerName/Instance#.log`
// //
// WARNING: Log management and how kubelet should interface with the // WARNING: Log management and how kubelet should interface with the
// container logs are under active discussion in // container logs are under active discussion in