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

🐛 avoid errors when MHC and upgrade occur together in classy clusters #8464

Merged
merged 1 commit into from
Apr 25, 2023
Merged

🐛 avoid errors when MHC and upgrade occur together in classy clusters #8464

merged 1 commit into from
Apr 25, 2023

Conversation

ykakarap
Copy link
Contributor

@ykakarap ykakarap commented Apr 4, 2023 •
edited by fabriziopandini
Loading

What this PR does / why we need it:

This PR addresses the problem that can happen for classy clusters if machine remediation is triggered on MachineDeployments while in the middle of a Cluster upgrade.
This problem is a side effect of kubeadm failing to join nodes of a Kubernetes version older of the control plane version

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

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 4, 2023
@ykakarap ykakarap changed the title 🐛 [EXPERIMENT][DNR] avoid deadlock when MHC and upgrade occur together in classy clusters 🐛 [EXPERIMENT][DNR] avoid errors when MHC and upgrade occur together in classy clusters Apr 6, 2023
@ykakarap ykakarap force-pushed the pr-mhc-upgrade-deadlock-fix branch from 4fe4e6c to 051ef5d Compare April 14, 2023 05:56
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 14, 2023
@ykakarap ykakarap changed the title 🐛 [EXPERIMENT][DNR] avoid errors when MHC and upgrade occur together in classy clusters 🐛 [WIP] avoid errors when MHC and upgrade occur together in classy clusters Apr 14, 2023
@ykakarap
Copy link
Contributor Author

/retest

sbueringer
sbueringer reviewed Apr 14, 2023
View reviewed changes
Copy link
Member

@sbueringer sbueringer left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Just a few nits and one bug or something :)

internal/controllers/topology/cluster/scope/state.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/scope/upgradetracker.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/scope/upgradetracker.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/scope/upgradetracker.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/conditions.go Outdated Show resolved Hide resolved
internal/controllers/topology/cluster/desired_state_test.go Show resolved Hide resolved
@ykakarap ykakarap force-pushed the pr-mhc-upgrade-deadlock-fix branch from 0aa67ae to 29a879e Compare April 14, 2023 19:19
@ykakarap ykakarap changed the title 🐛 [WIP] avoid errors when MHC and upgrade occur together in classy clusters 🐛 avoid errors when MHC and upgrade occur together in classy clusters Apr 14, 2023
@ykakarap ykakarap force-pushed the pr-mhc-upgrade-deadlock-fix branch from 29a879e to 3f9302e Compare April 15, 2023 06:15
@ykakarap
Copy link
Contributor Author

/retest

@sbueringer sbueringer force-pushed the pr-mhc-upgrade-deadlock-fix branch from 3f9302e to 20032af Compare April 24, 2023 16:24
@sbueringer
Copy link
Member

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

@sbueringer
Copy link
Member

/cherry-pick release-1.4

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.4

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.

@sbueringer
Copy link
Member

/retest

@sbueringer
Copy link
Member

/lgtm

Also ran some local test. Everything seems to behave as expected

/assign @killianmuldoon
for a final review

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

LGTM label has been added.

Git tree hash: 59c8697d46fd7f4858861b1124920c360422c188

@sbueringer
Copy link
Member

/retest

1 similar comment
@sbueringer
Copy link
Member

/retest

@killianmuldoon
Copy link
Contributor

/lgtm

killianmuldoon
killianmuldoon reviewed Apr 25, 2023
View reviewed changes
Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: killianmuldoon

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 Apr 25, 2023
@k8s-ci-robot k8s-ci-robot merged commit 8ca8170 into kubernetes-sigs:main Apr 25, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.5 milestone Apr 25, 2023
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Apr 25, 2023
Merged
@k8s-infra-cherrypick-robot
Copy link

@sbueringer: new pull request created: #8568

In response to this:

/cherry-pick release-1.4

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.

@johannesfrey
Copy link
Contributor

/area clusterclass

@k8s-ci-robot k8s-ci-robot added the area/clusterclass Issues or PRs related to clusterclass label Jun 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@killianmuldoon killianmuldoon killianmuldoon left review comments

@fabriziopandini fabriziopandini fabriziopandini left review comments

@sbueringer sbueringer sbueringer left review comments

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

@richardcase richardcase Awaiting requested review from richardcase

Assignees

@sbueringer sbueringer

@killianmuldoon killianmuldoon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/clusterclass Issues or PRs related to clusterclass 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.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.

MachineDeployment Status should take MachineHealthCheck into account when computing final status
7 participants
@ykakarap @sbueringer @k8s-infra-cherrypick-robot @k8s-ci-robot @killianmuldoon @johannesfrey @fabriziopandini