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.

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

🌱 Implement MS remediating conditions #11382

Merged
merged 3 commits into from
Nov 8, 2024
Merged

🌱 Implement MS remediating conditions #11382

merged 3 commits into from
Nov 8, 2024

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Nov 5, 2024 •
edited
Loading

What this PR does / why we need it:

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

@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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 5, 2024
@k8s-ci-robot k8s-ci-robot added the do-not-merge/needs-area PR is missing an area label label Nov 5, 2024
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 5, 2024
@sbueringer sbueringer mentioned this pull request Nov 5, 2024
Open
59 tasks
@sbueringer sbueringer added the area/machineset Issues or PRs related to machinesets label Nov 5, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Nov 5, 2024
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 6, 2024
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 7, 2024
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 7, 2024
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 7, 2024
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@sbueringer sbueringer changed the title [WIP] 🌱 Implement MS remediating conditions 🌱 Implement MS remediating conditions Nov 7, 2024
@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 Nov 7, 2024
@sbueringer sbueringer added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Nov 7, 2024
@sbueringer sbueringer mentioned this pull request Nov 7, 2024
Merged
fabriziopandini
fabriziopandini reviewed Nov 7, 2024
View reviewed changes
internal/controllers/machineset/machineset_controller_status.go Outdated Show resolved Hide resolved
internal/controllers/machineset/machineset_controller.go Outdated
// Calculate how many in flight machines we should remediate.
// By default, we allow all machines to be remediated at the same time.
maxInFlight := len(filteredMachines)
maxInFlight := len(machinesToRemediate)
Copy link
Member

Choose a reason for hiding this comment

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

In the original versions this was len(all machines).
However, this should not make a difference because in both cases, if mf.Spec.Strategy.Remediation.MaxInFlight is not set, both values are good enough to ensure we can always delete all the machines to be remediated.
Is this correct?

Copy link
Member Author

@sbueringer sbueringer Nov 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Yes! I was just thinking that len(machinesToRemediate) makes more sense. As we are only remediating at most len(machinesToRemediate) not all Machines.

I guess we could also just set this to MaxInt. Just slightly more obvious :) (I"ll probably do that)

internal/controllers/machineset/machineset_controller.go Show resolved Hide resolved
internal/controllers/machineset/machineset_controller.go Show resolved Hide resolved
internal/controllers/machineset/machineset_controller_test.go Outdated Show resolved Hide resolved
internal/controllers/machineset/machineset_controller_test.go Outdated Show resolved Hide resolved
@sbueringer
Fix review findings
4b20c92 
Signed-off-by: Stefan Büringer [email protected]
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@fabriziopandini
Copy link
Member

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: 981030dbf96041789407d4fab3dc236ed11b1bac

@fabriziopandini
Copy link
Member

Great work!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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:

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 8, 2024
@k8s-ci-robot k8s-ci-robot merged commit fe0aa63 into kubernetes-sigs:main Nov 8, 2024
19 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Nov 8, 2024
@sbueringer sbueringer deleted the pr-ms-remediation branch November 8, 2024 11:23
phoban01 pushed a commit to phoban01/cluster-api that referenced this pull request Nov 13, 2024
@sbueringer @phoban01
🌱 Implement MS remediating conditions (kubernetes-sigs#11382)
dfc9c79 
* Implement MS remediating conditions

Signed-off-by: Stefan Büringer [email protected]

* Fix review findings

* Fix review findings

Signed-off-by: Stefan Büringer [email protected]

---------

Signed-off-by: Stefan Büringer [email protected]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabriziopandini fabriziopandini fabriziopandini left review comments

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

@vincepri vincepri Awaiting requested review from vincepri

Assignees

@fabriziopandini fabriziopandini

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/machineset Issues or PRs related to machinesets cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Milestone
v1.9
Development

Successfully merging this pull request may close these issues.
3 participants
@sbueringer @fabriziopandini @k8s-ci-robot