🐛Check errors for IsNotFound after patching spec and status #10787
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
area/util
k8s-ci-robot
added
the
size/M
troy0820
force-pushed
the
troy0820/patch-ignore-option
branch
from
2d389a3
to
d6ac4de
Compare
mcbenjemaa
reviewed
Jun 21, 2024
troy0820
force-pushed
the
troy0820/patch-ignore-option
branch
from
d6ac4de
to
13dba33
Compare
k8s-ci-robot
added
size/L
troy0820
force-pushed
the
troy0820/patch-ignore-option
branch
2 times, most recently
from
0b48a19
to
42fa16e
Compare
|
/hold going to comment on the issue on the reasoning for the hold |
k8s-ci-robot
added
the
do-not-merge/hold
troy0820
force-pushed
the
troy0820/patch-ignore-option
branch
from
42fa16e
to
1a51016
Compare
k8s-ci-robot
added
size/XS
troy0820
changed the title
troy0820
commented
Jul 11, 2024
|
/assign @sbueringer |
troy0820
force-pushed
the
troy0820/patch-ignore-option
branch
from
1a51016
to
120874b
Compare
|
/test pull-cluster-api-e2e-main |
sbueringer
reviewed
Jul 15, 2024
util/patch/patch.go
Outdated
| if err := h.patchStatus(ctx, obj); err != nil { | ||
| errs = append(errs, err) | ||
| if !apierrors.IsNotFound(err) && !obj.GetDeletionTimestamp().IsZero() && len(obj.GetFinalizers()) == 0 { |
There was a problem hiding this comment.
I think the if is not entirely correct
See
if err := h.patchStatus(ctx, obj); err != nil {
if !(apierrors.IsNotFound(err) && !obj.GetDeletionTimestamp().IsZero() && len(obj.GetFinalizers()) == 0) {
errs = append(errs, err)
}
}
```
There was a problem hiding this comment.
How did I forget the ( and the ) 🤦🏽♂️
This should be good to go now.
There was a problem hiding this comment.
No worries, that's why we do reviews :)
Signed-off-by: Troy Connor <troy0820@users.noreply.github.com>
troy0820
force-pushed
the
troy0820/patch-ignore-option
branch
from
120874b
to
c8ae301
Compare
|
Thank you very much!! /lgtm /hold cancel |
k8s-ci-robot
added
lgtm
|
LGTM label has been added. Git tree hash: af7e5f0dfb22f0b35f80444857a1ed1c786d67b5
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: sbueringer 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 |
k8s-ci-robot
added
the
approved
vincepri
reviewed
Jul 15, 2024
| if err := h.patchStatus(ctx, obj); err != nil { | ||
| errs = append(errs, err) | ||
| if !(apierrors.IsNotFound(err) && !obj.GetDeletionTimestamp().IsZero() && len(obj.GetFinalizers()) == 0) { |
There was a problem hiding this comment.
I can add a test for this and submit a new PR.
There was a problem hiding this comment.
PR with the test #10866
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
This allows the patch helper to ignore patching the status when creating a patch.The solution for the issue below was to check the object if the finalizers are removed and if the DeletionTimeStamp was not nil and the error after patching the status/spec was
IsNotFound. This will cut down on noise as well as achieve with not exposing the internals of the patch helper.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 #10786
/area util