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

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

Merged
merged 1 commit into from Mar 15, 2021

Conversation

yangjunmyfm192085
Copy link
Contributor

@yangjunmyfm192085 yangjunmyfm192085 commented Feb 7, 2021

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 kind/feature size/L cncf-cla: yes do-not-merge/needs-sig needs-triage labels Feb 7, 2021
@k8s-ci-robot
Copy link
Contributor

@k8s-ci-robot k8s-ci-robot commented Feb 7, 2021

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 needs-ok-to-test area/kubelet sig/node and removed do-not-merge/needs-sig labels Feb 7, 2021
@k8s-ci-robot k8s-ci-robot requested review from matthyx and resouer Feb 7, 2021
@matthyx
Copy link
Contributor

@matthyx 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 yangjunmyfm192085 commented Feb 8, 2021

@matthyx
Copy link
Contributor

@matthyx 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

@k8s-ci-robot k8s-ci-robot requested a review from serathius Feb 8, 2021
pkg/kubelet/kubelet_pods.go Outdated Show resolved Hide resolved
pkg/kubelet/kubelet_pods.go Outdated Show resolved Hide resolved
pkg/kubelet/kubelet_pods.go Outdated Show resolved Hide resolved
pkg/kubelet/kubelet_pods.go Outdated Show resolved Hide resolved
pkg/kubelet/kubelet_pods.go Outdated Show resolved Hide resolved
pkg/kubelet/kubelet_pods.go Outdated Show resolved Hide resolved
pkg/kubelet/kubelet_pods.go Outdated Show resolved Hide resolved
pkg/kubelet/kubelet_pods.go Outdated Show resolved Hide resolved
pkg/kubelet/kubelet_pods.go Outdated Show resolved Hide resolved
pkg/kubelet/kubelet_pods.go Outdated Show resolved Hide resolved
pkg/kubelet/kubelet_pods.go Outdated Show resolved Hide resolved
@ehashman
Copy link
Member

@ehashman ehashman commented Mar 13, 2021

/retest

@ehashman
Copy link
Member

@ehashman ehashman commented Mar 13, 2021

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold 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 label Mar 13, 2021
@kikisdeliveryservice
Copy link
Member

@kikisdeliveryservice kikisdeliveryservice commented Mar 13, 2021

@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

@yangjunmyfm192085 yangjunmyfm192085 commented Mar 13, 2021

thank you,I will try at once

Signed-off-by: JunYang <yang.jun22@zte.com.cn>
@yangjunmyfm192085
Copy link
Contributor Author

@yangjunmyfm192085 yangjunmyfm192085 commented Mar 13, 2021

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

@yangjunmyfm192085
Copy link
Contributor Author

@yangjunmyfm192085 yangjunmyfm192085 commented Mar 13, 2021

/test pull-kubernetes-unit

@yangjunmyfm192085
Copy link
Contributor Author

@yangjunmyfm192085 yangjunmyfm192085 commented Mar 13, 2021

/test pull-kubernetes-e2e-kind

@kikisdeliveryservice
Copy link
Member

@kikisdeliveryservice kikisdeliveryservice commented Mar 13, 2021

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 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
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

@mrunalp mrunalp Mar 15, 2021

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

@k8s-ci-robot k8s-ci-robot commented Mar 15, 2021

[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 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
14 checks passed
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 and removed release-note labels Mar 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved area/kubelet cncf-cla: yes kind/cleanup lgtm ok-to-test priority/important-soon release-note-none sig/node size/L triage/accepted
Development

Successfully merging this pull request may close these issues.

None yet

8 participants