Cherry-pick #8265 to 6.x: Add support for log tags in newest CRI spec #8273
Conversation
This file contains 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
exekias
force-pushed
the
backport_8265_6.x
branch
from
6135e4e to
1f4a9aa
Compare
* Add support for log tags in newest CRI spec CRI spec has changed to include tags (to tell if the line is full or partial): ``` 2016-10-06T00:17:09.669794202Z stdout F The content of the log entry 1 2016-10-06T00:17:09.669794202Z stdout P First line of log entry 2 2016-10-06T00:17:09.669794202Z stdout P Second line of the log entry 2 2016-10-06T00:17:10.113242941Z stderr F Last line of the log entry 2 ``` I still have to determine how this affects the older format, obviously this change is breaking it, but to be seen if CRI is still supporting it. For more details you can check: https://github.com/kubernetes/community/blob/master/contributors/design-proposals/node/kubelet-cri-logging.md (cherry picked from commit 0a20f58)
exekias
force-pushed
the
backport_8265_6.x
branch
from
1f4a9aa to
2ad6631
Compare
jsoriano
approved these changes
Sep 10, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Cherry-pick of PR #8265 to 6.x branch. Original message:
CRI spec has changed to include tags (to tell if the line is full or
partial):
In order to support both the previous and this new format, this PR introduces a new flag you can pass to the
dockerinput (cri.parse_flags):cri.parse_flagsis disabled by default, we should flip this to enabled by default in 7.0.For more details you can check:
https://github.com/kubernetes/community/blob/master/contributors/design-proposals/node/kubelet-cri-logging.md
Fixes #8257