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.

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

Structured Logging migration: modify node and pod part logs of kubelet. #98847

Merged
merged 1 commit into from Mar 15, 2021
Merged

Structured Logging migration: modify node and pod part logs of kubelet. #98847

merged 1 commit into from Mar 15, 2021

Conversation

yangjunmyfm192085
Copy link
Contributor

@yangjunmyfm192085 yangjunmyfm192085 commented Feb 7, 2021 •
edited by liggitt

Signed-off-by: JunYang yang.jun22@zte.com.cn

What type of PR is this?
/kind feature

What this PR does / why we need it:
Structured Logging migration: modify node and pod part logs of kubelet.
xref:
https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/1602-structured-logging
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/migration-to-structured-logging.md
Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:
part of kubernetes/enhancements#1602
As it is related to log, change the log here to structured log.
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 release-note-none Denotes a PR that doesn't merit a release note. kind/feature Categorizes issue or PR as related to a new feature. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Feb 7, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @yangjunmyfm192085. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Feb 7, 2021
@matthyx
Copy link
Contributor

matthyx commented Feb 7, 2021

@yangjunmyfm192085 can you give more context about this PR? Do you have a related issue to link to?

@yangjunmyfm192085
Copy link
Contributor Author

@yangjunmyfm192085 can you give more context about this PR? Do you have a related issue to link to?
ok, link here
xref:
https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/1602-structured-logging
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/migration-to-structured-logging.md

@matthyx
Copy link
Contributor

matthyx commented Feb 8, 2021

Are you working with sig-instrumentation?
Because it looks like the KEP already provides the top priority log messages to modify:
https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/1602-structured-logging#proposed-list-of-log-messages-to-change

It looks like none of your PRs (#98847 and #98850) are actually treating these files...

/cc @serathius

@ehashman
Copy link
Member

/retest

@ehashman
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 13, 2021
@ehashman ehashman moved this from Waiting on Author to Needs Approver in SIG Node PR Triage Mar 13, 2021
@ehashman ehashman moved this from Waiting on Author to Needs Approver in Structured Logging Migration for Kubelet, 1.21 Mar 13, 2021
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 13, 2021
@kikisdeliveryservice
Copy link
Member

kikisdeliveryservice commented Mar 13, 2021 •
edited

@yangjunmyfm192085 do you still mean to have this extra author in the commit? You probably need a:
git commit --amend --reset-author then git push -f to fix that from the bad rebase.. LMK and I'll lgtm when you're ready.

@kikisdeliveryservice kikisdeliveryservice moved this from Needs Approver to Waiting on Author in SIG Node PR Triage Mar 13, 2021
@kikisdeliveryservice kikisdeliveryservice moved this from Needs Approver to Waiting on Author in Structured Logging Migration for Kubelet, 1.21 Mar 13, 2021
@yangjunmyfm192085
Copy link
Contributor Author

thank you，I will try at once

@yangjunmyfm192085
Structured Logging migration: modify node and pod part logs of kubelet.
90bfd38 
Signed-off-by: JunYang <yang.jun22@zte.com.cn>
@yangjunmyfm192085
Copy link
Contributor Author

I have fixed it, thank you very much.@kikisdeliveryservice @ehashman

@yangjunmyfm192085
Copy link
Contributor Author

/test pull-kubernetes-unit

@yangjunmyfm192085
Copy link
Contributor Author

/test pull-kubernetes-e2e-kind

@kikisdeliveryservice
Copy link
Member

I have fixed it, thank you very much.@kikisdeliveryservice @ehashman

Yay! Glad you got it sorted 😸 @yangjunmyfm192085
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 13, 2021
@kikisdeliveryservice kikisdeliveryservice moved this from Waiting on Author to Needs Approver in SIG Node PR Triage Mar 13, 2021
@kikisdeliveryservice kikisdeliveryservice moved this from Waiting on Author to Needs Approver in Structured Logging Migration for Kubelet, 1.21 Mar 13, 2021
mrunalp
mrunalp reviewed Mar 15, 2021
View reviewed changes
pkg/kubelet/kubelet_pods.go
return false
}
// pod's containers should be deleted
runtimeStatus, err := kl.podCache.Get(pod.UID)
if err != nil {
klog.V(3).Infof("Pod %q is terminated, Error getting runtimeStatus from the podCache: %s", format.Pod(pod), err)
klog.V(3).InfoS("Pod is terminated, Error getting runtimeStatus from the podCache", "pod", klog.KObj(pod), "err", err)
Copy link
Contributor

Choose a reason for hiding this comment

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

s/Error/error

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mrunalp, yangjunmyfm192085

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 15, 2021
@mrunalp mrunalp moved this from Needs Approver to Done in Structured Logging Migration for Kubelet, 1.21 Mar 15, 2021
@k8s-ci-robot k8s-ci-robot merged commit 7046e1d into kubernetes:master Mar 15, 2021
SIG Node PR Triage automation moved this from Needs Approver to Done Mar 15, 2021
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Mar 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehashman ehashman ehashman left review comments

@serathius serathius serathius requested changes

@kikisdeliveryservice kikisdeliveryservice kikisdeliveryservice left review comments

@mrunalp mrunalp mrunalp approved these changes

@matthyx matthyx Awaiting requested review from matthyx

@resouer resouer Awaiting requested review from resouer

Assignees

@mrunalp mrunalp

@ehashman ehashman

@Random-Liu Random-Liu

@serathius serathius

@kikisdeliveryservice kikisdeliveryservice

@matthyx matthyx

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node PR Triage
Done
Structured Logging Migration for Kube...
  
Done
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@yangjunmyfm192085 @k8s-ci-robot @matthyx @serathius @ehashman @kikisdeliveryservice @mrunalp @Random-Liu