This repository was archived by the owner on Mar 9, 2022. It is now read-only.
Add an OCI annotation for sandbox log directory.#1056
Merged
Random-Liu merged 1 commit intocontainerd:masterfrom Mar 8, 2019
Merged
Add an OCI annotation for sandbox log directory.#1056Random-Liu merged 1 commit intocontainerd:masterfrom
Random-Liu merged 1 commit intocontainerd:masterfrom
Conversation
mikebrow
approved these changes
Feb 23, 2019
pkg/annotations/annotations.go
Outdated
| SandboxID = "io.kubernetes.cri.sandbox-id" | ||
|
|
||
| // SandboxLogDir is the pod log directory annotation. | ||
| // If the sandbox needs to generate any log, it can put it into this directory. |
pkg/annotations/annotations.go
Outdated
|
|
||
| // SandboxLogDir is the pod log directory annotation. | ||
| // If the sandbox needs to generate any log, it can put it into this directory. | ||
| // Kubelet will be responsible to: |
pkg/annotations/annotations.go
Outdated
| // SandboxLogDir is the pod log directory annotation. | ||
| // If the sandbox needs to generate any log, it can put it into this directory. | ||
| // Kubelet will be responsible to: | ||
| // 1) Monitoring the disk usage of the log, and include it as part of the pod |
pkg/annotations/annotations.go
Outdated
| // Kubelet will be responsible to: | ||
| // 1) Monitoring the disk usage of the log, and include it as part of the pod | ||
| // ephemeral storage usage. | ||
| // 2) Cleanup the logs when the pod is deleted. |
pkg/annotations/annotations.go
Outdated
| // 1) Monitoring the disk usage of the log, and include it as part of the pod | ||
| // ephemeral storage usage. | ||
| // 2) Cleanup the logs when the pod is deleted. | ||
| // NOTE that kubelet is not responsible for rotating the logs. |
Signed-off-by: Lantao Liu <[email protected]>
Random-Liu
force-pushed
the
add-sandbox-log-dir-annotation
branch
from
bc2559b to
9eabcf5
Compare
Member
Author
|
Addressed comments about the comment. Apply LGTM based on #1056 (review) |
Member
Author
|
/test pull-cri-containerd-node-e2e |
Random-Liu
added a commit
that referenced
this pull request
Mar 8, 2019
Cherrypick #1056 release 1.2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add an OCI annotation to pass down the pod log directory.
This is useful for sandbox runtime which has pod level logs, e.g. gvisor. Actually I chatted with @resouer about this, and he told me that kata used to have pod level logs as well.
Especially after kubernetes/kubernetes#74441 lands, Kubelet will be responsible for monitoring the disk usage and cleanup these logs.
@mikebrow Are you ok with cherrypicking this to release/1.2? It doesn't break anyone. :)
Signed-off-by: Lantao Liu [email protected]