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

CRI: update documentation for container logpath

Browse Source
This commit is contained in:
Pengfei Ni
2018-04-02 17:02:49 +08:00
parent 47a1aac931
commit 038af53c5a
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