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

🌱 MHC should not remediate paused machines #3444

Merged
merged 1 commit into from
Aug 5, 2020

Conversation

benmoss
Copy link

@benmoss benmoss commented Aug 3, 2020

What this PR does / why we need it:
Right now the MHC controller only checks if the MHC object itself or the Cluster is paused. It seems reasonable users would expect that pausing a machine would also pause remediation on 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):
Fixes #3421

In #3108 I unintentionally changed the logic here to return when we encounter an error patching one of the machines, instead of the prior behavior of continuing to try to remediate all of the machines before returning an error collection. This also brings back that logic.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 3, 2020
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 3, 2020
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

Thanks! Can we add a test as well?

controllers/machinehealthcheck_controller.go Outdated Show resolved Hide resolved
controllers/machinehealthcheck_controller.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 3, 2020
@detiber
Copy link
Member

detiber commented Aug 3, 2020

/test pull-cluster-api-verify

@detiber
Copy link
Member

detiber commented Aug 3, 2020

changes lgtm pending @vincepri's request for a test

@benmoss
Copy link
Author

benmoss commented Aug 3, 2020

Do we actually want to mark it with clusterv1.MachineHealthCheckSucceededCondition = false and just not put the remediation needed condition on?

@benmoss
Copy link
Author

benmoss commented Aug 3, 2020

I think that's the right thing, so I've updated the implementation to do so

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 3, 2020
@vincepri
Copy link
Member

vincepri commented Aug 3, 2020

/milestone v0.3.9

@k8s-ci-robot k8s-ci-robot added this to the v0.3.9 milestone Aug 3, 2020
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.

@benmoss thanks for this PR!

controllers/machinehealthcheck_controller.go Show resolved Hide resolved
@vincepri
Copy link
Member

vincepri commented Aug 4, 2020

/test pull-cluster-api-test
/test pull-cluster-api-verify

Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve
/assign @detiber @fabriziopandini

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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 Aug 4, 2020
@detiber
Copy link
Member

detiber commented Aug 4, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 4, 2020
@fabriziopandini
Copy link
Member

/retest

@vincepri
Copy link
Member

vincepri commented Aug 5, 2020

/test pull-cluster-api-test

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.

MHC should respect pause annotation on Machines
5 participants