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

Jump to bottom

✨ MachineHealthCheck now supports external remediation templates #3606

Merged
merged 1 commit into from Oct 22, 2020
Merged

✨ MachineHealthCheck now supports external remediation templates #3606

merged 1 commit into from Oct 22, 2020

Conversation

jan-est
Copy link
Contributor

@jan-est jan-est commented Sep 8, 2020 •
edited

What this PR does / why we need it:

This PR implements External Remediation proposal 3190

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 8, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @jan-est. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 8, 2020
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 8, 2020
@jan-est
Copy link
Contributor Author

jan-est commented Sep 8, 2020

/assign @ncdc
/assign @vincepri
/assign @JoelSpeed

@JoelSpeed
Copy link
Contributor

CC @n1r1

JoelSpeed
JoelSpeed reviewed Sep 8, 2020
View reviewed changes
Copy link
Contributor

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

/ok-to-test

api/v1alpha3/machinehealthcheck_types.go Show resolved Hide resolved
controllers/machinehealthcheck_controller.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 8, 2020
@jan-est jan-est force-pushed the mhc-external-remediation-jan branch 8 times, most recently from add85dc to 0eef674 Compare September 14, 2020 08:50
vincepri
vincepri reviewed Sep 15, 2020
View reviewed changes
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.

Overall looks good,

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

We also need to add some tests

@ncdc
Copy link
Contributor

ncdc commented Oct 16, 2020

Hmm I could have sworn that used to be possible.

@vincepri
Copy link
Member

/approve cancel
/hold cancel

Waiting for another round of review before approving :)

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 16, 2020
@jan-est jan-est force-pushed the mhc-external-remediation-jan branch from cb60b2c to 99393b6 Compare October 19, 2020 06:23
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Oct 19, 2020 •
edited

@jan-est: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-cluster-api-verify-external-links 569bf0e link /test pull-cluster-api-verify-external-links

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@jan-est jan-est force-pushed the mhc-external-remediation-jan branch 4 times, most recently from fb29193 to 050798a Compare October 19, 2020 08:57
@vincepri vincepri mentioned this pull request Oct 20, 2020
Merged
@jan-est jan-est force-pushed the mhc-external-remediation-jan branch from 050798a to 9aa6fe4 Compare October 21, 2020 07:03
@vincepri
Copy link
Member

LGTM

wfernandes
wfernandes reviewed Oct 21, 2020
View reviewed changes
Copy link
Contributor

@wfernandes wfernandes left a comment

Choose a reason for hiding this comment

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

Just one minor nit.
Also it may be nice to have tests to assert that the expected conditions are being set whenever appropriate.

api/v1alpha3/condition_consts.go Outdated
ExternalRemediationTemplateNotFound = "ExternalRemediationTemplateNotFound"

// ExternalRemediationRequestAvailable is set on machinehealthchecks when MachineHealthCheck controller uses external remediation.
// ExternalRemediationTemplateAvailable is set to false if creating external remediation request fails.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// ExternalRemediationTemplateAvailable is set to false if creating external remediation request fails.
// ExternalRemediationRequestAvailable is set to false if creating external remediation request fails.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How badly this PR blocks 3713? Maybe we could enhance testing in another PR?

@jan-est jan-est force-pushed the mhc-external-remediation-jan branch from 9aa6fe4 to a34fad7 Compare October 22, 2020 05:28
@jan-est jan-est force-pushed the mhc-external-remediation-jan branch from a34fad7 to 83bf1a0 Compare October 22, 2020 14:00
@ncdc
Copy link
Contributor

ncdc commented Oct 22, 2020

/hold cancel
/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Oct 22, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ncdc

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 Oct 22, 2020
@k8s-ci-robot k8s-ci-robot merged commit b1444af into kubernetes-sigs:release-0.3 Oct 22, 2020
@jan-est jan-est mentioned this pull request Oct 22, 2020
Closed
@jan-est jan-est deleted the mhc-external-remediation-jan branch November 4, 2020 11:31
@slintes slintes mentioned this pull request Nov 30, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@beekhof beekhof beekhof left review comments

@wfernandes wfernandes wfernandes left review comments

@vincepri vincepri vincepri approved these changes

@fabriziopandini fabriziopandini fabriziopandini left review comments

@JoelSpeed JoelSpeed JoelSpeed left review comments

@n1r1 n1r1 n1r1 left review comments

@ncdc ncdc ncdc approved these changes

@benmoss benmoss Awaiting requested review from benmoss

Assignees

@ncdc ncdc

@wfernandes wfernandes

@vincepri vincepri

@JoelSpeed JoelSpeed

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v0.3.11
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@jan-est @k8s-ci-robot @JoelSpeed @vincepri @wfernandes @ncdc @detiber @beekhof @fabriziopandini @n1r1