Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make kubelet ReadLogs backward compatible. #63268

Merged
merged 1 commit into from
Apr 28, 2018
Merged

Make kubelet ReadLogs backward compatible. #63268

merged 1 commit into from
Apr 28, 2018

Conversation

Random-Liu
Copy link
Member

@Random-Liu Random-Liu commented Apr 27, 2018 •
edited by feiskyer
Loading

containerLogPathLabelKey label was added in dockershim since 1.5. 121a91e

ContainerStatus.LogPath was added since Kubernetes 1.7. c3b5226

I believe it is safe to reply on this field without backward compatibility issue. And crictl is using it as well https://github.com/kubernetes-incubator/cri-tools/blob/master/cmd/crictl/logs.go#L88.

With this change, in the future, kubelet ReadLogs will be backward compatible as long as the log format is backward compatible.

@feiskyer @yujuhong @kubernetes/sig-node-pr-reviews

Signed-off-by: Lantao Liu lantaol@google.com

Release note:

Make kubelet ReadLogs backward compatible.

@Random-Liu
Make kubelet ReadLogs backward compatible.
4bb1665 
Signed-off-by: Lantao Liu <lantaol@google.com>
@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. release-note-none Denotes a PR that doesn't merit a release note. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 27, 2018
@yujuhong
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 27, 2018
@dims
Copy link
Member

dims commented Apr 27, 2018

LGTM 👍

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Random-Liu, yujuhong

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Random-Liu Random-Liu mentioned this pull request Apr 28, 2018
Closed
@Random-Liu
Copy link
Member Author

Random-Liu commented Apr 28, 2018 •
edited
Loading

/test pull-kubernetes-integration

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

feiskyer
feiskyer reviewed Apr 28, 2018
View reviewed changes
Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@k8s-github-robot
Copy link

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit ae53b78 into kubernetes:master Apr 28, 2018
@Random-Liu Random-Liu deleted the kubelet-readlog-backward-compatible branch July 11, 2018 20:05
@Random-Liu Random-Liu mentioned this pull request Jul 11, 2018
Merged
@feiskyer feiskyer mentioned this pull request Jul 12, 2018
Merged
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jul 12, 2018
k8s-github-robot pushed a commit that referenced this pull request Jul 14, 2018
Merge pull request #66096 from feiskyer/automated-cherry-pick-of-#632…
c838d0a 
…68-upstream-release-1.10

Automatic merge from submit-queue.

Automated cherry pick of #63268: Make kubelet `ReadLogs` backward compatible.

Cherry pick of #63268 on release-1.10.

#63268: Make kubelet `ReadLogs` backward compatible.

```release-note
Make kubelet ReadLogs backward compatible.
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@feiskyer feiskyer feiskyer left review comments

@dims dims Awaiting requested review from dims

@mtaufen mtaufen Awaiting requested review from mtaufen

Assignees

@feiskyer feiskyer

@yujuhong yujuhong

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Random-Liu @yujuhong @dims @k8s-ci-robot @k8s-github-robot @feiskyer