Skip to content

Conversation

@fabriziopandini
Copy link
Member

@fabriziopandini fabriziopandini commented Jan 16, 2025

What this PR does / why we need it:
This PR improve logs added when a machine is remediated by adding key value pair for Machine ns/name and another for the node name, while dropping the key "target" which contained a confusing "MHC.Namespace/MHC.Name/Machine.Name/Node.Name".

Also, message now uses a more intuitive "Machine has failed health check..." instead of "Target has failed health check"

/area machinehalthcheck

@k8s-ci-robot
Copy link
Contributor

@fabriziopandini: The label(s) area/machinehalthcheck cannot be applied, because the repository doesn't have them.

In response to this:

What this PR does / why we need it:
This PR improve logs added when a machine is remediated by adding key value pair for Machine ns/name and for the node, while dropping the key "target" which contained a confusing "MHC.Namespace/MHC.Name/Machine.Name/Node.Name".

Also, message now uses a more intuitive "Machine has failed health check..." instead of "Target has failed health check"

/area machinehalthcheck

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.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 16, 2025
@k8s-ci-robot k8s-ci-robot added do-not-merge/needs-area PR is missing an area label size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 16, 2025
@fabriziopandini fabriziopandini force-pushed the improve-machine-remediation-logs branch from 516eedc to 2a3b552 Compare January 16, 2025 12:42
@fabriziopandini fabriziopandini added the area/machinehealthcheck Issues or PRs related to machinehealthchecks label Jan 16, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Jan 16, 2025
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 17, 2025
@fabriziopandini fabriziopandini added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jan 17, 2025
@sbueringer
Copy link
Member

Thx!

/lgtm

/assign @chrischdi

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

LGTM label has been added.

Git tree hash: 23f3bf9897456a7455a60ef1260957d1a8c48ff8

@chrischdi
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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 Jan 20, 2025
@k8s-ci-robot k8s-ci-robot merged commit 11ce72b into kubernetes-sigs:main Jan 20, 2025
20 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.10 milestone Jan 20, 2025
@fabriziopandini
Copy link
Member Author

/cherry-pick release-1.9

@fabriziopandini
Copy link
Member Author

/cherry-pick release-1.8

@k8s-infra-cherrypick-robot

@fabriziopandini: new pull request created: #11706

In response to this:

/cherry-pick release-1.9

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.

@k8s-infra-cherrypick-robot

@fabriziopandini: #11692 failed to apply on top of branch "release-1.8":

Applying: Improve Machine remediation logs
Using index info to reconstruct a base tree...
M	internal/controllers/machinehealthcheck/machinehealthcheck_controller.go
Falling back to patching base and 3-way merge...
Auto-merging internal/controllers/machinehealthcheck/machinehealthcheck_controller.go
CONFLICT (content): Merge conflict in internal/controllers/machinehealthcheck/machinehealthcheck_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Improve Machine remediation logs

In response to this:

/cherry-pick release-1.8

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.

@fabriziopandini fabriziopandini deleted the improve-machine-remediation-logs branch January 21, 2025 14:47
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. area/machinehealthcheck Issues or PRs related to machinehealthchecks 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/S Denotes a PR that changes 10-29 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants