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

fix error checking in kl.killPod within SyncPod #124342

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

zhifei92
Copy link

@zhifei92 zhifei92 commented Apr 17, 2024

What type of PR is this?

/kind bug
/kind cleanup

What this PR does / why we need it:

fix error checking in kl.killPod within SyncPod: when kl.killPod returns nil, wait.Interrupted always returns false, nil, and SyncPod consequently returns — this is not the expected behavior. move it to the correct position

    if err := kl.killPod(ctx, pod, p, nil); err == nil {
        if wait.Interrupted(err) {
            return false, err
        }

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

refs #117412, hi @smarterclayton , could you review it for me, thx.

Does this PR introduce a user-facing change?


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


@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. 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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Apr 17, 2024
@k8s-ci-robot
Copy link
Contributor

Please note that we're already in Test Freeze for the release-1.30 branch. This means every merged PR will be automatically fast-forwarded via the periodic ci-fast-forward job to the release branch of the upcoming v1.30.0 release.

Fast forwards are scheduled to happen every 6 hours, whereas the most recent run was: Wed Apr 17 01:52:11 UTC 2024.

@k8s-ci-robot k8s-ci-robot added 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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 17, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @zhifei92. 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 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 Apr 17, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: zhifei92
Once this PR has been reviewed and has the lgtm label, please assign derekwaynecarr for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@zhifei92
Copy link
Author

/sig node

@bart0sh bart0sh added this to Triage in SIG Node PR Triage Apr 17, 2024
@bart0sh
Copy link
Contributor

bart0sh commented Apr 17, 2024

/triage accepted
/priority important-longterm
/ok-to-test
/release-note-none

@zhifei92 Thank you for your contribution! As this is a bugfix, please provide e2e test case to cover the issue.

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. 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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 17, 2024
@bart0sh bart0sh moved this from Triage to Needs Reviewer in SIG Node PR Triage Apr 17, 2024
pkg/kubelet/kubelet.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 19, 2024
@zhifei92
Copy link
Author

/test pull-kubernetes-conformance-kind-ga-only-parallel

@zhifei92
Copy link
Author

/retest

@zhifei92 zhifei92 requested a review from bart0sh April 19, 2024 10:30
@zhifei92
Copy link
Author

/retest-required

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

LGTM label has been added.

Git tree hash: 65f2d3b2700f059f4b2c58d96b6066648a292d7f

@bart0sh bart0sh moved this from Needs Reviewer to Needs Approver in SIG Node PR Triage Apr 20, 2024
@bart0sh bart0sh removed their assignment Apr 20, 2024
@zhifei92
Copy link
Author

/assign @wojtek-t Please help review this.

@rphillips
Copy link
Member

/lgtm

@zhifei92
Copy link
Author

@derekwaynecarr hi, this PR needs an approval label, please help review it.

@zhifei92
Copy link
Author

hi @rphillips @bart0sh do we need anyone's else review?

@bart0sh
Copy link
Contributor

bart0sh commented Apr 26, 2024

do we need anyone's else review?

As this pr already lgtm-ed, we need SIG-node approvers to take a look

/assign @mrunlap @derekwaynecarr @dchen1107
for approval

@k8s-ci-robot
Copy link
Contributor

@bart0sh: GitHub didn't allow me to assign the following users: mrunlap.

Note that only kubernetes members with read permissions, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

do we need anyone's else review?

As this pr already lgtm-ed, we need SIG-node approvers to take a look

/assign @mrunlap @derekwaynecarr @dchen1107
for approval

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.

@bart0sh
Copy link
Contributor

bart0sh commented Apr 26, 2024

/assign @mrunalp

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. 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-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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node PR Triage
Needs Approver
Development

Successfully merging this pull request may close these issues.

None yet

7 participants