Skip to content

feature(kubectl): support priority sorting option to control pod eviction order by kubectl drain #130206

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

feature(kubectl): support priority sorting option to control pod eviction order by kubectl drain #130206

wants to merge 1 commit into from

Conversation

googs1025
Copy link
Member

@googs1025 googs1025 commented Feb 17, 2025 •
edited
Loading

What type of PR is this?

/kind feature

What this PR does / why we need it:

  • support priority sorting option to control pod eviction order by kubectl drain

Which issue(s) this PR fixes:

Fixes kubernetes/kubectl#1347

Special notes for your reviewer:

Does this PR introduce a user-facing change?

When using kubectl drain, the default eviction priority is from low priority to high priority, and a new priority-descending option is added to control pod eviction order.

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

None

@k8s-ci-robot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. kind/feature Categorizes issue or PR as related to a new feature. 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. labels Feb 17, 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-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 Feb 17, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: googs1025
Once this PR has been reviewed and has the lgtm label, please assign apelisse 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/kubectl sig/cli Categorizes an issue or PR as relevant to SIG CLI. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Feb 17, 2025
@googs1025
Copy link
Member Author

/test all

@soltysh soltysh self-assigned this Feb 17, 2025
@googs1025
Copy link
Member Author

/test pull-kubernetes-node-e2e-containerd

@googs1025 googs1025 marked this pull request as ready for review February 26, 2025 12:48
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 26, 2025
@k8s-ci-robot k8s-ci-robot requested a review from seans3 February 26, 2025 12:48
@googs1025
Copy link
Member Author

@soltysh @ardaguclu can you help this ? thanks

@googs1025
Copy link
Member Author

@soltysh can you help this?

googs1025
googs1025 commented Jun 27, 2025
View reviewed changes
staging/src/k8s.io/kubectl/pkg/cmd/drain/drain.go
@@ -230,7 +230,7 @@ func NewCmdDrain(f cmdutil.Factory, ioStreams genericiooptions.IOStreams) *cobra
cmd.Flags().StringVarP(&o.drainer.PodSelector, "pod-selector", "", o.drainer.PodSelector, "Label selector to filter pods on the node")
cmd.Flags().BoolVar(&o.drainer.DisableEviction, "disable-eviction", o.drainer.DisableEviction, "Force drain to use delete, even if eviction is supported. This will bypass checking PodDisruptionBudgets, use with caution.")
cmd.Flags().IntVar(&o.drainer.SkipWaitForDeleteTimeoutSeconds, "skip-wait-for-delete-timeout", o.drainer.SkipWaitForDeleteTimeoutSeconds, "If pod DeletionTimestamp older than N seconds, skip waiting for the pod. Seconds must be greater than 0 to skip.")

cmd.Flags().BoolVar(&o.drainer.PriorityDescending, "priority-descending", o.drainer.PriorityDescending, "If true, sort and evict pods by priority in descending order (highest priority first). If false, sort in ascending order (lowest priority first).")
Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not sure if this flags setting is reasonable. 🤔 It seems that I need to rethink it. Maybe if it is set to true, it will go from high to low priority, and if it is not set, it will be better to leave it unchanged?

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

@brianpursley brianpursley Awaiting requested review from brianpursley

@soltysh soltysh Awaiting requested review from soltysh

@seans3 seans3 Awaiting requested review from seans3

Assignees

@soltysh soltysh

Labels
area/kubectl cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cli Categorizes an issue or PR as relevant to SIG CLI. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
SIG CLI
Status: Needs Triage
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

kubectl drain: influencing order of draining Pods
3 participants
@googs1025 @k8s-ci-robot @soltysh