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

fix: hydration race for terminating nodes #1853

Merged
merged 1 commit into from
Nov 30, 2024

Conversation

jmdeal
Copy link
Member

@jmdeal jmdeal commented Nov 29, 2024

Fixes #N/A

Description
Separates the hydration controller from the NodeClaim lifecycle controller since we need to ensure details are hydrated regardless of the lifecycle state of the NodeClaim. The motivating example for this change is Node's which were terminating during the upgrade. Since the hydration subreconciler only acted against non-terminating NodeClaims, the details would never get propagated to these Nodes leaving them orphaned after an upgrade.

How was this change tested?
make test

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 29, 2024
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 29, 2024
@jmdeal jmdeal force-pushed the fix/hydration-race branch 3 times, most recently from 8a97f3f to 546364a Compare November 29, 2024 23:39
@coveralls
Copy link

coveralls commented Nov 29, 2024

Pull Request Test Coverage Report for Build 12092653837

Details

  • 47 of 91 (51.65%) changed or added relevant lines in 4 files are covered.
  • 4 unchanged lines in 1 file lost coverage.
  • Overall coverage decreased (-0.3%) to 80.618%

Changes Missing Coverage Covered Lines Changed/Added Lines %
pkg/controllers/controllers.go 0 2 0.0%
pkg/controllers/nodeclaim/hydration/controller.go 22 34 64.71%
pkg/utils/node/node.go 0 13 0.0%
pkg/controllers/node/hydration/controller.go 25 42 59.52%
Files with Coverage Reduction New Missed Lines %
pkg/controllers/disruption/consolidation.go 4 88.55%
Totals Coverage Status
Change from base Build 12092434724: -0.3%
Covered Lines: 8926
Relevant Lines: 11072

💛 - Coveralls

Copy link
Member

@jonathan-innis jonathan-innis left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 30, 2024
@jmdeal
Copy link
Member Author

jmdeal commented Nov 30, 2024

/hold

@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 Nov 30, 2024
@jmdeal jmdeal force-pushed the fix/hydration-race branch from 546364a to 99e6292 Compare November 30, 2024 01:35
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2024
@jmdeal jmdeal force-pushed the fix/hydration-race branch from 99e6292 to 38559e8 Compare November 30, 2024 01:46
Copy link
Contributor

@engedaam engedaam left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2024
@jmdeal jmdeal force-pushed the fix/hydration-race branch from 38559e8 to 9dbbe32 Compare November 30, 2024 02:04
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2024
Copy link
Member

@jonathan-innis jonathan-innis left a comment

Choose a reason for hiding this comment

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

/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 30, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: engedaam, jmdeal, jonathan-innis

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

@jmdeal
Copy link
Member Author

jmdeal commented Nov 30, 2024

/unhold

@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 Nov 30, 2024
@k8s-ci-robot k8s-ci-robot merged commit b4d0971 into kubernetes-sigs:main Nov 30, 2024
12 checks passed
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. 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants