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

✨ Add MachineDrainRule "WaitCompleted" #11545

Open

vincepri wants to merge 1 commit into kubernetes-sigs:main from vincepri:pod-drain-waitcompleted

Member

vincepri commented Dec 5, 2024 •

edited

Loading

What this PR does / why we need it:

This PR adds the ability for drain to wait for the completion of specific pods. This is useful in scenario where drain is either handled outside the context of kubectl drain after a Node is cordoned, or for long running batch Jobs that should be allowed to terminate on their own.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

k8s-ci-robot added the do-not-merge/work-in-progress label

k8s-ci-robot requested review from fabriziopandini and JoelSpeed

December 5, 2024 16:06

k8s-ci-robot added cncf-cla: yes do-not-merge/needs-area size/M labels

vincepri force-pushed the pod-drain-waitcompleted branch 2 times, most recently from bab1c1b to 211839e Compare

December 11, 2024 19:41

vincepri added the area/machine label

k8s-ci-robot removed the do-not-merge/needs-area label

vincepri added priority/important-soon do-not-merge/needs-area labels

sbueringer reviewed

View reviewed changes

api/v1beta1/machinedrainrules_types.go Show resolved Hide resolved

api/v1beta1/machinedrainrules_types.go Outdated Show resolved Hide resolved

internal/controllers/machine/drain/drain.go Outdated Show resolved Hide resolved

internal/controllers/machine/drain/filters.go Outdated Show resolved Hide resolved

internal/controllers/machine/drain/filters.go Show resolved Hide resolved

internal/controllers/machine/drain/drain.go Show resolved Hide resolved

internal/controllers/machine/drain/drain.go

               		conditionMessage = fmt.Sprintf("%s\nAfter above Pods have been removed from the Node, the following Pods will be evicted: %s",
               			conditionMessage, PodListToString(r.PodsToTriggerEvictionLater, 3))
               	}
+              	if len(r.PodsToWaitCompleted) > 0 {

Member

sbueringer Dec 30, 2024

@fabriziopandini Is this something that should be specifically handled on higher levels when the condition bubbles up? (like we handled PDB's etc.)

(could also be a follow-up PR)

sbueringer reviewed

View reviewed changes

api/v1beta1/machinedrainrules_types.go Outdated Show resolved Hide resolved

api/v1beta1/machinedrainrules_types.go Outdated Show resolved Hide resolved

internal/controllers/machine/drain/drain.go Outdated Show resolved Hide resolved

internal/controllers/machine/drain/filters.go Show resolved Hide resolved

internal/controllers/machine/drain/filters.go Outdated Show resolved Hide resolved

internal/controllers/machine/drain/filters.go Outdated Show resolved Hide resolved

internal/controllers/machine/drain/drain.go Show resolved Hide resolved

vincepri changed the title ~~WIP: ✨ Add MachineDrainRule "WaitCompleted"~~ ✨ Add MachineDrainRule "WaitCompleted"

k8s-ci-robot removed the do-not-merge/work-in-progress label

vincepri added do-not-merge/work-in-progress and removed do-not-merge/needs-area labels

vincepri force-pushed the pod-drain-waitcompleted branch from 211839e to 533803e Compare

January 7, 2025 19:02

Contributor

k8s-ci-robot commented Jan 7, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from vincepri. 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:

OWNERS

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 added size/L and removed size/M labels

vincepri removed the do-not-merge/work-in-progress label

vincepri force-pushed the pod-drain-waitcompleted branch 2 times, most recently from 8826d5b to e22bc4d Compare

January 9, 2025 15:18

Member Author

vincepri commented Jan 9, 2025

/test ?

Contributor

k8s-ci-robot commented Jan 9, 2025

@vincepri: The following commands are available to trigger required jobs:

/test pull-cluster-api-build-main

/test pull-cluster-api-e2e-blocking-main

/test pull-cluster-api-e2e-conformance-ci-latest-main

/test pull-cluster-api-e2e-conformance-main

/test pull-cluster-api-e2e-latestk8s-main

/test pull-cluster-api-e2e-main

/test pull-cluster-api-e2e-mink8s-main

/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

/test pull-cluster-api-test-main

/test pull-cluster-api-test-mink8s-main

/test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

/test pull-cluster-api-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-apidiff-main

pull-cluster-api-build-main

pull-cluster-api-e2e-blocking-main

pull-cluster-api-test-main

pull-cluster-api-verify-main

In response to this:

/test ?

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.

Member Author

vincepri commented Jan 9, 2025

/test pull-cluster-api-e2e-main

vincepri force-pushed the pod-drain-waitcompleted branch from e22bc4d to 1ebe3c2 Compare

January 9, 2025 20:10

Member Author

vincepri commented Jan 9, 2025

/test pull-cluster-api-e2e-main

vincepri force-pushed the pod-drain-waitcompleted branch from 1ebe3c2 to ba555de Compare

January 9, 2025 20:31

Member Author

vincepri commented Jan 9, 2025

/test pull-cluster-api-e2e-main

vincepri force-pushed the pod-drain-waitcompleted branch from ba555de to 6650be9 Compare

January 9, 2025 21:36

k8s-ci-robot added size/XL and removed size/L labels

Contributor

k8s-ci-robot commented Jan 9, 2025 •

edited

Loading

@vincepri: 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-cluster-api-e2e-main	`e22bc4d`	link	true	`/test pull-cluster-api-e2e-main`

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.


          ✨ Add MachineDrainRule "WaitCompleted"

dbf82f8

Signed-off-by: Vince Prignano <[email protected]>

vincepri force-pushed the pod-drain-waitcompleted branch from 6650be9 to dbf82f8 Compare

January 9, 2025 23:51

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

Labels

area/machine cncf-cla: yes priority/important-soon size/XL