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.

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

🐛 Machine: sort list of pre-drain hooks for stable condition messages #11624

Merged

Conversation

sbueringer
Copy link
Member

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

What this PR does / why we need it:
Follow-up to #11487

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

/cherry-pick release-1.9

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Dec 27, 2024
@k8s-infra-cherrypick-robot

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.9 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.9

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.

@sbueringer sbueringer added the area/machine Issues or PRs related to machine lifecycle management label Dec 27, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Dec 27, 2024
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@@ -1128,12 +1128,12 @@ func TestDeletingCondition(t *testing.T) {
},
reconcileDeleteExecuted: true,
deletingReason: clusterv1.MachineDeletingWaitingForPreDrainHookV1Beta2Reason,
deletingMessage: "Waiting for pre-drain hooks to complete (hooks: test-hook)",
deletingMessage: "Waiting for pre-drain hooks to succeed (hooks: test-hook)",
Copy link
Member

Choose a reason for hiding this comment

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

Q:what about adding a test with more than one hook validating that hooks are sorted?

Copy link
Member Author

@sbueringer sbueringer Dec 27, 2024

Choose a reason for hiding this comment

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

These tests are not executing the fixed/affected code

(I only updated them because I did a search/replace on the changed condition message)

Copy link
Member Author

Choose a reason for hiding this comment

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

We have no code coverage on the pre-drain code path (this PR) or the pre-terminate code path (fixed in the previous PR: #11487).

I can open a follow-up issue if you want, but I wouldn't want to block this PR because of that if possible

@fabriziopandini
Copy link
Member

/lgtm
/approve

Please open a follow up issue to add testing for hooks sorting

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

LGTM label has been added.

Git tree hash: b433145ff7a6448b73303fdd71ce9dc0ece7d2ec

@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 Dec 27, 2024
@k8s-ci-robot k8s-ci-robot merged commit 44360af into kubernetes-sigs:main Dec 27, 2024
22 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.10 milestone Dec 27, 2024
@k8s-infra-cherrypick-robot

@sbueringer: new pull request created: #11625

In response to this:

/cherry-pick release-1.9

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.

@sbueringer
Copy link
Member Author

I think we should add tests for more than just the sorting part. Opened an issue accordingly: #11626

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/machine Issues or PRs related to machine lifecycle management 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants