Skip to content

Conversation

bigkevmcd
Copy link
Contributor

@bigkevmcd bigkevmcd commented Jan 30, 2025

If an object is deleted and the API responds with a resource, update the deleted object.

This causes the object to be updated with the deletion timestamp.

The fake Client was already behaving like this.

Fixes #3059

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 30, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @bigkevmcd. 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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 30, 2025
@alvaroaleman
Copy link
Member

/ok-to-test

@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 Jan 30, 2025
@bigkevmcd bigkevmcd force-pushed the delete-response branch 3 times, most recently from e2ca8b7 to 68cdf84 Compare February 4, 2025 06:12
@bigkevmcd bigkevmcd marked this pull request as ready for review February 4, 2025 06:45
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 4, 2025
@k8s-ci-robot k8s-ci-robot requested a review from troy0820 February 4, 2025 06:45
@bigkevmcd bigkevmcd force-pushed the delete-response branch 2 times, most recently from 8ed5e0b to 5b4fcfc Compare February 4, 2025 09:24
@alvaroaleman
Copy link
Member

/ok-to-test

Copy link
Member

@alvaroaleman alvaroaleman left a comment

Choose a reason for hiding this comment

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

Thanks, this is great! We also need to update the fake client to match the behavior

nodeName := node.Name
err = cl.Delete(context.TODO(), node)
Expect(err).NotTo(HaveOccurred())
Expect(node.ObjectMeta.DeletionTimestamp).NotTo(BeNil())
Copy link
Member

Choose a reason for hiding this comment

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

Can we also test this with unstructured.Unstructured and metav1.MetaObject, please?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unstructured works... metav1.MetaObject will require a fair bit more work.

return resInt.Delete(ctx, metadata.Name, *deleteOpts.AsDeleteOptions())

Not sure if this is relevant?

// TODO(directxman12): we could rewrite this on top of the low-level REST

Copy link
Member

Choose a reason for hiding this comment

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

I think we should also implement this for the metadata client. It's already tricky that we change a nuance like this, but I think it's a lot worse if our clients behave inconsistently

@bigkevmcd
Copy link
Contributor Author

Thanks, this is great! We also need to update the fake client to match the behavior

My reading of this test is that the fake client does actually work?

Expect(obj.DeletionTimestamp).NotTo(BeNil())

@alvaroaleman
Copy link
Member

That example is after a Get call, it should be set after a Delete call

@sbueringer
Copy link
Member

/assign

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: bigkevmcd
Once this PR has been reviewed and has the lgtm label, please ask for approval from sbueringer. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

Body(deleteOpts.AsDeleteOptions()).
Do(ctx).
Error()
Into(obj)
Copy link
Member

@sbueringer sbueringer May 12, 2025

Choose a reason for hiding this comment

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

I ran this through the debugger and this object looks like this afterwards if I'm not mistaken:

image

(I assume this is the case when we don't have a finalizer on the object, but this is still bad?)

Copy link
Member

@sbueringer sbueringer May 12, 2025

Choose a reason for hiding this comment

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

I think we also need a test case that when we delete via Unstructured without a finalizer the object keeps its data and does not become a Status object

Copy link
Member

Choose a reason for hiding this comment

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

Should we maybe just check if the returned body is a status and only if its not update the original object?

Copy link
Member

Choose a reason for hiding this comment

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

As far as I can tell there's no way to tell apart you got the object back or a metav1.Status unless you actually read the request body.

Copy link
Member

Choose a reason for hiding this comment

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

Which I think might be okay, the main overhead will be that we have to deserialize it twice if it is not a status

Copy link
Member

@sbueringer sbueringer Sep 15, 2025

Choose a reason for hiding this comment

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

I think it would be a bad UX if after calling client.Delete() you only sometimes see the deletionTimestamp set :/

Copy link
Member

Choose a reason for hiding this comment

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

In general, it appears if it's gone from storage you'll get Status object in the response body. (You can try Pod deletion with grace period.) But I don't think there's a guarantee around any of this in the API machinery.

Copy link
Member

Choose a reason for hiding this comment

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

I think it would be a bad UX if after calling client.Delete() you only sometimes see the deletionTimestamp set :/

I mean what can we realistically put in there if the object is gone from storage? I guess we could put a non-nil fake deletiontimestamp in there but not sure if that is a good idea.

What is IMHO annoying about the current state is that you can not do a check of Did I already delete this

Copy link
Member

Choose a reason for hiding this comment

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

Since Delete() already doesn't do what we expect it to do, what if we changed its return signature to (deletedFromStorage bool, err error)?

Copy link
Member

Choose a reason for hiding this comment

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

I mean what can we realistically put in there if the object is gone from storage? I guess we could put a non-nil fake deletiontimestamp in there but not sure if that is a good idea.

Yup agree. I mostly just meant that if deletionTimestamp is only sometimes set (aka in some cases) this would be tricky to rely on

@k8s-triage-robot
Copy link

The Kubernetes project currently lacks enough contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

  • After 90d of inactivity, lifecycle/stale is applied
  • After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle stale
  • Close this PR with /close
  • Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle stale

@k8s-ci-robot k8s-ci-robot added lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 10, 2025
@k8s-triage-robot
Copy link

The Kubernetes project currently lacks enough active contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

  • After 90d of inactivity, lifecycle/stale is applied
  • After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle rotten
  • Close this PR with /close
  • Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle rotten

@k8s-ci-robot k8s-ci-robot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Sep 9, 2025
@alvaroaleman
Copy link
Member

Ref #3059

@sbueringer
Copy link
Member

Added it to the PR description

If an object is deleted and the API responds with a resource, update the
deleted object.

This causes the object to be updated with the deletion timestamp.

Signed-off-by: Kevin McDermott <[email protected]>
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Object doesn't get updated after Client.Delete(object)
6 participants