github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #115292 from SergeyKanzhelev/wrongDirName

Browse Source 
change the comment in CRI API to point to the correct logs directory
This commit is contained in:
Kubernetes Prow Robot 2023-01-30 17:37:00 -08:00 committed by GitHub
commit 9fb6306068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.pb.go
View File

@ -1315,7 +1315,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/<NAMESPACE>_<NAME>_<UID>/`
// ContainerConfig.LogPath = `containerName/Instance#.log` // ContainerConfig.LogPath = `containerName/Instance#.log`
LogDirectory string `protobuf:"bytes,3,opt,name=log_directory,json=logDirectory,proto3" json:"log_directory,omitempty"` LogDirectory string `protobuf:"bytes,3,opt,name=log_directory,json=logDirectory,proto3" json:"log_directory,omitempty"`
// DNS config for the sandbox. // DNS config for the sandbox.
@ -4716,13 +4716,8 @@ 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/<NAMESPACE>_<NAME>_<UID>/`
// ContainerConfig.LogPath = `containerName/Instance#.log` // ContainerConfig.LogPath = `containerName/Instance#.log`
//
// WARNING: Log management and how kubelet should interface with the
// container logs are under active discussion in
// https://issues.k8s.io/24677. There *may* be future change of direction
// for logging as the discussion carries on.
LogPath string `protobuf:"bytes,11,opt,name=log_path,json=logPath,proto3" json:"log_path,omitempty"` LogPath string `protobuf:"bytes,11,opt,name=log_path,json=logPath,proto3" json:"log_path,omitempty"`
// Variables for interactive containers, these have very specialized // Variables for interactive containers, these have very specialized
// use-cases (e.g. debugging). // use-cases (e.g. debugging).

9
staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.proto
View File

@ -420,7 +420,7 @@ message PodSandboxConfig {
// containers. For example, the files might be newline separated JSON // containers. For example, the files might be newline separated JSON
// 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/<NAMESPACE>_<NAME>_<UID>/`
// ContainerConfig.LogPath = `containerName/Instance#.log` // ContainerConfig.LogPath = `containerName/Instance#.log`
string log_directory = 3; string log_directory = 3;
// DNS config for the sandbox. // DNS config for the sandbox.
@ -1060,13 +1060,8 @@ message ContainerConfig {
// Path relative to PodSandboxConfig.LogDirectory for container to store // Path relative to PodSandboxConfig.LogDirectory for container to store
// 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/<NAMESPACE>_<NAME>_<UID>/`
// ContainerConfig.LogPath = `containerName/Instance#.log` // ContainerConfig.LogPath = `containerName/Instance#.log`
//
// WARNING: Log management and how kubelet should interface with the
// container logs are under active discussion in
// https://issues.k8s.io/24677. There *may* be future change of direction
// for logging as the discussion carries on.
string log_path = 11; string log_path = 11;
// Variables for interactive containers, these have very specialized // Variables for interactive containers, these have very specialized