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

⚠️ Machine: ignore attached Volumes referred by pods ignored during drain #11246

Merged
merged 4 commits into from
Oct 23, 2024
Merged

⚠️ Machine: ignore attached Volumes referred by pods ignored during drain #11246

merged 4 commits into from
Oct 23, 2024

Conversation

chrischdi
Copy link
Member

@chrischdi chrischdi commented Oct 1, 2024 •
edited by sbueringer
Loading

What this PR does / why we need it:

Improves shouldWaitForNodeVolumes to ignore volumes referred by pods which were ignored during drain.

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

/area machine

@k8s-ci-robot k8s-ci-robot added area/machine Issues or PRs related to machine lifecycle management cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 1, 2024
@chrischdi
Copy link
Member Author

/test help

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 1, 2024
@k8s-ci-robot
Copy link
Contributor

@chrischdi: The specified target(s) for /test were not found.
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-31-1-32-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 help

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
Copy link
Member Author

/test pull-cluster-api-e2e-main

@chrischdi
Copy link
Member Author

/retest

@chrischdi chrischdi force-pushed the pr-wait-for-volume-detach branch from 151fd64 to 2b2ab87 Compare October 2, 2024 08:49
@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-main

1 similar comment
@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-main

@k8s-ci-robot k8s-ci-robot added 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. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 4, 2024
@chrischdi chrischdi force-pushed the pr-wait-for-volume-detach branch from 4f7d24f to f2d390b Compare October 4, 2024 10:24
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 4, 2024
@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-main

2 similar comments
@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-main

@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-main

@chrischdi chrischdi force-pushed the pr-wait-for-volume-detach branch from 8259fca to 3057c55 Compare October 4, 2024 13:53
@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-main

@chrischdi
Copy link
Member Author

chrischdi commented Oct 4, 2024 •
edited
Loading

/hold

To wait for:

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 4, 2024
@chrischdi chrischdi changed the title ✨ [WIP] Machine: ignore attached Volumes referred by pods ignored during drain ✨ Machine: ignore attached Volumes referred by pods ignored during drain Oct 4, 2024
@chrischdi
Copy link
Member Author

/retest

@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-main

fabriziopandini
fabriziopandini reviewed Oct 7, 2024
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

I would mark this PR as breaking change to make it pop up in the release notes
I still have to make a pass to tests

internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Show resolved Hide resolved
internal/controllers/machine/drain/filters.go Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
@chrischdi chrischdi changed the title ✨ Machine: ignore attached Volumes referred by pods ignored during drain ⚠️ Machine: ignore attached Volumes referred by pods ignored during drain Oct 7, 2024
@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-main

@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-main

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 18, 2024
sbueringer
sbueringer reviewed Oct 18, 2024
View reviewed changes
internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller.go Outdated Show resolved Hide resolved
internal/controllers/machine/machine_controller_test.go Outdated Show resolved Hide resolved
@chrischdi chrischdi added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Oct 22, 2024
@chrischdi chrischdi force-pushed the pr-wait-for-volume-detach branch from 79741e6 to b3ecaad Compare October 22, 2024 07:02
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 22, 2024
@chrischdi chrischdi changed the title ⚠️ [WIP] Machine: ignore attached Volumes referred by pods ignored during drain ⚠️ Machine: ignore attached Volumes referred by pods ignored during drain Oct 22, 2024
@sbueringer
Copy link
Member

Really nice work! I especially like the nice test coverage!

/lgtm
/approve

/hold
In case Fabrizio also wants to take a look
/assign @fabriziopandini

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

LGTM label has been added.

Git tree hash: a033bee715cb3cf8f65710e35ac17a7dc38638de

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 22, 2024
@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-main

@fabriziopandini
Copy link
Member

/approve
/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini, sbueringer

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 [fabriziopandini,sbueringer]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sbueringer
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 23, 2024
@sbueringer
Copy link
Member

/test pull-cluster-api-test-main

@k8s-ci-robot k8s-ci-robot merged commit 508beae into kubernetes-sigs:main Oct 23, 2024
25 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Oct 23, 2024
@sbueringer sbueringer mentioned this pull request Oct 23, 2024
Open
8 tasks
@sbueringer sbueringer mentioned this pull request Nov 6, 2024
Merged
@Sunnatillo Sunnatillo mentioned this pull request Nov 19, 2024
Closed
54 tasks
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

@sbueringer sbueringer sbueringer left review comments

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

@killianmuldoon killianmuldoon Awaiting requested review from killianmuldoon

Assignees

@sbueringer sbueringer

@fabriziopandini fabriziopandini

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/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.
4 participants
@chrischdi @k8s-ci-robot @sbueringer @fabriziopandini