Skip to content

kubelet: ensure static pods terminate last during node shutdown #133465

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
Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

kubelet: ensure static pods terminate last during node shutdown #133465

wants to merge 1 commit into from
+34 −1

Conversation

xigang
Copy link
Member

@xigang xigang commented Aug 11, 2025 •
edited
Loading

What type of PR is this?

/kind bug

What this PR does / why we need it:

static pod should be deleted at priority=2000000000 group, but it not.

The problem lies in determining priority, as static pods do not have priority locally in kubelet, only priority names exist, see: https://github.com/kubernetes/kubernetes/blob/8e6d788887034b799f6c2a86991a68a080bb0576/pkg/kubelet/nodeshutdown/nodeshutdown_manager.go#L273C1-L275C5

		if pod.Spec.Priority != nil {
			priority = *pod.Spec.Priority
		}

		// Find the group index according to the priority.
		index := sort.Search(len(groups), func(i int) bool {
			return groups[i].Priority >= priority
		})

Which issue(s) this PR is related to:

Fixes #133442

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
Copy link
Contributor

Please note that we're already in Test Freeze for the release-1.34 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.34.0 release.

Fast forwards are scheduled to happen every 6 hours, whereas the most recent run was: Mon Aug 11 10:25:10 UTC 2025.

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 11, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: xigang
Once this PR has been reviewed and has the lgtm label, please assign sjenning for approval. For more information see the 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

@k8s-ci-robot k8s-ci-robot added area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. 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 Aug 11, 2025
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added needs-priority Indicates a PR lacks a `priority/foo` label and requires one. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Aug 11, 2025
@xigang
Copy link
Member Author

xigang commented Aug 11, 2025

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Aug 11, 2025
@xigang xigang mentioned this pull request Aug 11, 2025
Open
@xigang
Copy link
Member Author

xigang commented Aug 11, 2025

/sig node

@xigang
kubelet: shut down static pods last using highest grace period
e8c9ecd 
Signed-off-by: xigang <wangxigang2014@gmail.com>
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 11, 2025
@xigang
Copy link
Member Author

xigang commented Aug 11, 2025

cc @SergeyKanzhelev @wzshiming

@xigang xigang changed the title kubelet: shut down static pods last using highest grace period kubelet: ensure static pods terminate last during node shutdown Aug 11, 2025
@xigang
Copy link
Member Author

xigang commented Aug 12, 2025

/test pull-kubernetes-unit-windows-master

@k8s-ci-robot
Copy link
Contributor

@xigang: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kubernetes-unit-windows-master e8c9ecd link false /test pull-kubernetes-unit-windows-master

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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-sigs/prow repository. I understand the commands that are listed here.

HirazawaUi
HirazawaUi reviewed Aug 12, 2025
View reviewed changes
Copy link
Contributor

@HirazawaUi HirazawaUi left a comment

Choose a reason for hiding this comment

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

Thank you for the PR. I believe it makes sense to respect the Priority of static pods. The Pod Priority Based Graceful Node Shutdown KEP doesn't mention static pods – perhaps we should add static pods as part of the KEP.

However, your implemented code seems to expect all static pods to be set to the highest priority. This doesn't match your description exactly. If we proceed in this direction, it might require further discussion.

pkg/kubelet/nodeshutdown/nodeshutdown_manager.go

groups = append(groups, podShutdownGroup{
ShutdownGracePeriodByPodPriority: kubeletconfig.ShutdownGracePeriodByPodPriority{
Priority: int32(math.MaxInt32),
Copy link
Contributor

@HirazawaUi HirazawaUi Aug 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Why is it math.MaxInt32 here? For static pods with the system-node-critical priority class, if fails to properly set pod.Spec.Priority, maybe we should override their effective priority to scheduling.SystemCriticalPriority + 1000.
ref:

kubernetes/pkg/apis/scheduling/v1/helpers.go

Lines 30 to 36 in 790393a

{
ObjectMeta: metav1.ObjectMeta{
Name: scheduling.SystemNodeCritical,
},
Value: scheduling.SystemCriticalPriority + 1000,
Description: "Used for system critical pods that must not be moved from their current node.",
},

pkg/kubelet/nodeshutdown/nodeshutdown_manager.go
for _, pod := range pods {
if kubetypes.IsStaticPod(pod) {
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems you expect all static pods to be put into this group, but this doesn't match your description. Should all static pods be deleted last? Is that intended?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@HirazawaUi HirazawaUi HirazawaUi left review comments

@krmayankk krmayankk Awaiting requested review from krmayankk

@matthyx matthyx Awaiting requested review from matthyx

Assignees
No one assigned
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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
SIG Node: code and documentation PRs
Status: Triage
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

static pod will be kill first when node shutdown even if highest priority
3 participants
@xigang @k8s-ci-robot @HirazawaUi