✨ MachinePools: Use NodeDeletionTimeout and default it to 10s #10553

serngawy · 2024-05-03T15:53:09Z

What this PR does / why we need it:
Ignore unreachable cluster while deleting machinePools

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

k8s-ci-robot · 2024-05-03T15:53:18Z

Welcome @serngawy!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2024-05-03T15:53:19Z

Hi @serngawy. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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.

killianmuldoon

/ok-to-test
/area machinepools

k8s-ci-robot · 2024-05-08T08:40:59Z

@killianmuldoon: The label(s) area/machinepools cannot be applied, because the repository doesn't have them.

In response to this:

/ok-to-test
/area machinepools

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.

chrischdi · 2024-05-08T09:08:19Z

I think this one goes into a different direction then described in:

Failed to delete machinePool for unreachable cluster #10544 (comment)

and

Failed to delete machinePool for unreachable cluster #10544 (comment)

/hold

serngawy · 2024-05-14T20:31:05Z

/cc @mboersma

serngawy · 2024-05-14T20:31:50Z

@mboersma would review the PR and let me know your thoughts.

exp/internal/controllers/machinepool_controller.go

exp/internal/controllers/machinepool_controller_test.go

sbueringer · 2024-07-10T09:21:38Z

I think we're almost there :)

sbueringer · 2024-07-15T13:33:58Z

@serngawy If you got time, if we get the findings addressed pretty soon, we'll get this merged in time for v1.8 :) (just a heads up)

(Feel free to ping me in Slack for another review)

serngawy · 2024-07-16T11:18:10Z

@serngawy If you got time, if we get the findings addressed pretty soon, we'll get this merged in time for v1.8 :) (just a heads up)

(Feel free to ping me in Slack for another review)

Thanks @sbueringer for the follow up. Unfortunately in PTO this week, will work on it next week.

sbueringer · 2024-07-16T11:48:19Z

@serngawy If you got time, if we get the findings addressed pretty soon, we'll get this merged in time for v1.8 :) (just a heads up)
(Feel free to ping me in Slack for another review)

Thanks @sbueringer for the follow up. Unfortunately in PTO this week, will work on it next week.

Enjoy your time off!

exp/internal/controllers/machinepool_controller.go

sbueringer · 2024-07-23T16:55:49Z

Please rebase this PR on top of main instead of merging main into this PR.

I don't remember the exact reason, but I think we run into problems when we merge PRs that have merge commits from main

sbueringer · 2024-07-23T17:06:04Z

Let's rebase onto main, address #10553 (comment) and then merge this PR

I'll probably do another iteration on the unit tests as a follow-up PR. I would prefer testing slightly more realistic scenarios

Signed-off-by: melserngawy <[email protected]>

sbueringer · 2024-07-23T18:51:55Z

Thank you!

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

/assign @chrischdi

k8s-ci-robot · 2024-07-23T18:52:00Z

LGTM label has been added.

Git tree hash: 1743c72d9a5ea8b6c72eb26bfb742cb09deecddf

sbueringer · 2024-07-24T06:43:53Z

/retest

chrischdi

Can we change the title to something which better describes this change?

I think this currently not only makes "MachinePools to honour the NodeDeletionTimeout".

Am I right that this also helps deleting a MachinePool when Bootstrap.ConfigRef or InfrastructureRef is not set?

If yes the title should highlight both because it will be part of release notes (ok to have as follow-up).

chrischdi · 2024-07-24T08:33:04Z

exp/internal/webhooks/machinepool.go

+	if m.Spec.Template.Spec.NodeDeletionTimeout == nil {
+		m.Spec.Template.Spec.NodeDeletionTimeout = &metav1.Duration{Duration: defaultNodeDeletionTimeout}
+	}


Adding defaulting to 10 seconds and skipping the node deletion IMHO is a change in the behaviour of the controller.

Should we mark this as feature (❇️ ) in the title?

Note: this should not get cherry-picked to older release branches, but maybe folks more involved in MachinePools can argue better.

chrischdi · 2024-07-24T08:56:34Z

/retitle ✨ MachinePools: Use NodeDeletionTimeout and default it to 10s

/approve
/hold cancel

k8s-ci-robot · 2024-07-24T08:56:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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:

~~OWNERS~~ [chrischdi]

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 requested review from killianmuldoon and sbueringer May 3, 2024 15:53

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label labels May 3, 2024

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 3, 2024

serngawy force-pushed the issue-10544 branch from b53fbfc to f79b079 Compare May 6, 2024 16:49

killianmuldoon reviewed May 8, 2024

View reviewed changes

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 8, 2024

killianmuldoon added the area/machinepool Issues or PRs related to machinepools label May 8, 2024

k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label May 8, 2024

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 8, 2024

k8s-ci-robot requested a review from mboersma May 14, 2024 20:31

mboersma reviewed May 14, 2024

View reviewed changes

exp/internal/controllers/machinepool_controller.go Outdated Show resolved Hide resolved

serngawy force-pushed the issue-10544 branch from f79b079 to 4519543 Compare May 21, 2024 15:51

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 May 21, 2024

serngawy force-pushed the issue-10544 branch 2 times, most recently from 022d53e to 6da8906 Compare May 21, 2024 19:39

enxebre reviewed May 31, 2024

View reviewed changes

exp/internal/controllers/machinepool_controller.go Outdated Show resolved Hide resolved

enxebre reviewed May 31, 2024

View reviewed changes

exp/internal/controllers/machinepool_controller.go Show resolved Hide resolved

enxebre reviewed May 31, 2024

View reviewed changes

exp/internal/controllers/machinepool_controller.go Outdated Show resolved Hide resolved

enxebre reviewed May 31, 2024

View reviewed changes

exp/internal/controllers/machinepool_controller.go Show resolved Hide resolved

serngawy force-pushed the issue-10544 branch from 42fae34 to 30abfa1 Compare July 4, 2024 03:33

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 4, 2024

k8s-ci-robot requested a review from sbueringer July 4, 2024 03:33

sbueringer added this to the v1.8 milestone Jul 10, 2024

sbueringer reviewed Jul 10, 2024

View reviewed changes

exp/internal/controllers/machinepool_controller.go Outdated Show resolved Hide resolved

exp/internal/controllers/machinepool_controller.go Show resolved Hide resolved

sbueringer reviewed Jul 10, 2024

View reviewed changes

exp/internal/controllers/machinepool_controller_test.go Outdated Show resolved Hide resolved

exp/internal/controllers/machinepool_controller_test.go Show resolved Hide resolved

exp/internal/controllers/machinepool_controller_test.go Show resolved Hide resolved

serngawy force-pushed the issue-10544 branch 3 times, most recently from 3ad8d1b to 90431ac Compare July 22, 2024 21:30

sbueringer reviewed Jul 23, 2024

View reviewed changes

exp/internal/controllers/machinepool_controller.go Outdated Show resolved Hide resolved

Issue-10544 ignore unreachable cluster while deleting machinePool

e416ba3

Signed-off-by: melserngawy <[email protected]>

serngawy force-pushed the issue-10544 branch from 90431ac to e416ba3 Compare July 23, 2024 18:23

k8s-ci-robot assigned chrischdi Jul 23, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 23, 2024

chrischdi reviewed Jul 24, 2024

View reviewed changes

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 24, 2024

k8s-ci-robot changed the title ~~🐛 Let machinePools to honour NodeDeletionTimeout~~ ✨ MachinePools: Use NodeDeletionTimeout and default it to 10s Jul 24, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 24, 2024

k8s-ci-robot merged commit 42f7b89 into kubernetes-sigs:main Jul 24, 2024
26 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ MachinePools: Use NodeDeletionTimeout and default it to 10s #10553

✨ MachinePools: Use NodeDeletionTimeout and default it to 10s #10553

serngawy commented May 3, 2024 •

edited

Loading

k8s-ci-robot commented May 3, 2024

k8s-ci-robot commented May 3, 2024

killianmuldoon left a comment

k8s-ci-robot commented May 8, 2024

chrischdi commented May 8, 2024

serngawy commented May 14, 2024

serngawy commented May 14, 2024

sbueringer commented Jul 10, 2024

sbueringer commented Jul 15, 2024 •

edited

Loading

serngawy commented Jul 16, 2024

sbueringer commented Jul 16, 2024

sbueringer commented Jul 23, 2024 •

edited

Loading

sbueringer commented Jul 23, 2024 •

edited

Loading

sbueringer commented Jul 23, 2024

k8s-ci-robot commented Jul 23, 2024

sbueringer commented Jul 24, 2024

chrischdi left a comment •

edited

Loading

chrischdi Jul 24, 2024 •

edited

Loading

chrischdi commented Jul 24, 2024

k8s-ci-robot commented Jul 24, 2024

✨ MachinePools: Use NodeDeletionTimeout and default it to 10s #10553

✨ MachinePools: Use NodeDeletionTimeout and default it to 10s #10553

Conversation

serngawy commented May 3, 2024 • edited Loading

k8s-ci-robot commented May 3, 2024

k8s-ci-robot commented May 3, 2024

killianmuldoon left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented May 8, 2024

chrischdi commented May 8, 2024

serngawy commented May 14, 2024

serngawy commented May 14, 2024

sbueringer commented Jul 10, 2024

sbueringer commented Jul 15, 2024 • edited Loading

serngawy commented Jul 16, 2024

sbueringer commented Jul 16, 2024

sbueringer commented Jul 23, 2024 • edited Loading

sbueringer commented Jul 23, 2024 • edited Loading

sbueringer commented Jul 23, 2024

k8s-ci-robot commented Jul 23, 2024

sbueringer commented Jul 24, 2024

chrischdi left a comment • edited Loading

Choose a reason for hiding this comment

chrischdi Jul 24, 2024 • edited Loading

Choose a reason for hiding this comment

chrischdi commented Jul 24, 2024

k8s-ci-robot commented Jul 24, 2024

serngawy commented May 3, 2024 •

edited

Loading

sbueringer commented Jul 15, 2024 •

edited

Loading

sbueringer commented Jul 23, 2024 •

edited

Loading

sbueringer commented Jul 23, 2024 •

edited

Loading

chrischdi left a comment •

edited

Loading

chrischdi Jul 24, 2024 •

edited

Loading