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

Copy jsonlog from docker/docker locally #89013

Merged
merged 2 commits into from Mar 19, 2020
Merged

Copy jsonlog from docker/docker locally #89013

merged 2 commits into from Mar 19, 2020

Conversation

dims
Copy link
Member

@dims dims commented Mar 10, 2020 •
edited

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
Allows us to drop docker/docker/daemon/logger/jsonfilelog/jsonlog dependency

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 10, 2020
@dims
Copy link
Member Author

dims commented Mar 13, 2020

/test pull-kubernetes-e2e-kind

@mattjmcnaughton
Copy link
Contributor

Keeping me eyes on this re how it impacts #87746

I ended up just deleting jsonlog... but I think that caused some integration tests to fail. Should I try out my diff incorporating this change?

@dims
Copy link
Member Author

dims commented Mar 14, 2020

@mattjmcnaughton sure please do.

@dims dims changed the title [WIP] Copy jsonlog from docker/docker locally Copy jsonlog from docker/docker locally Mar 14, 2020
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Mar 14, 2020
@dims
Copy link
Member Author

dims commented Mar 14, 2020

/priority important-longterm

@k8s-ci-robot k8s-ci-robot added priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 14, 2020
liggitt
liggitt reviewed Mar 17, 2020
View reviewed changes
pkg/kubelet/kuberuntime/logs/logs.go
@@ -165,12 +164,32 @@ func parseCRILog(log []byte, msg *logMessage) error {
return nil
}

// jsonLog is a log message, typically a single entry from a given log stream.
Copy link
Member

Choose a reason for hiding this comment

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

note the type this comes from so people don't think we can arbitrarily rename these fields

Copy link
Member Author

Choose a reason for hiding this comment

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

ok, adding a note.

Copy link
Member

Choose a reason for hiding this comment

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

even stronger phrasing, as in "this deserializes the json log format returned by docker; do not modify this struct's fields or json serialization"

@liggitt
Copy link
Member

liggitt commented Mar 17, 2020

a few nits, lgtm otherwise. glad to see these start to go

@dims
make local copy of JSONLog
0c52ffe 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims
run update-vendor.sh
825f99c 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims dims force-pushed the copy-jsonlog-from-docker/docker-locally branch from 438f7fb to 825f99c Compare March 18, 2020 01:26
@dims
Copy link
Member Author

dims commented Mar 18, 2020

/assign @liggitt @derekwaynecarr @yujuhong

@dims
Copy link
Member Author

dims commented Mar 18, 2020

/test pull-kubernetes-e2e-kind-ipv6

@mattjmcnaughton
Copy link
Contributor

🎉 🙌

@dims mind pinging me when this is merged - I'll then rebase my dockerless branch and I am hopeful it should resolve the integration test failures.

@liggitt
Copy link
Member

liggitt commented Mar 19, 2020

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 19, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, liggitt

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 19, 2020
@k8s-ci-robot k8s-ci-robot merged commit e74ad38 into kubernetes:master Mar 19, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Mar 19, 2020
@dims
Copy link
Member Author

dims commented Mar 19, 2020

@mattjmcnaughton this is merged 🎉

@mattjmcnaughton
Copy link
Contributor

mattjmcnaughton commented Mar 20, 2020 via email

@mattjmcnaughton mattjmcnaughton mentioned this pull request Mar 20, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liggitt liggitt liggitt left review comments

@Random-Liu Random-Liu Awaiting requested review from Random-Liu

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@liggitt liggitt

@derekwaynecarr derekwaynecarr

@yujuhong yujuhong

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@dims @mattjmcnaughton @liggitt @k8s-ci-robot @derekwaynecarr @yujuhong