From 06736b1c35ebc85dde5a10debc0e2f3249a77342 Mon Sep 17 00:00:00 2001 From: Troy Connor Date: Wed, 8 Jan 2025 15:03:10 -0500 Subject: [PATCH] add deletionTimeStamp when deleting objects with clients Signed-off-by: Troy Connor --- pkg/client/fake/client.go | 2 ++ pkg/client/metadata_client.go | 2 ++ pkg/client/typed_client.go | 3 +++ pkg/client/unstructured_client.go | 3 +++ 4 files changed, 10 insertions(+) diff --git a/pkg/client/fake/client.go b/pkg/client/fake/client.go index 911f1a7b05..5d751a6b81 100644 --- a/pkg/client/fake/client.go +++ b/pkg/client/fake/client.go @@ -763,6 +763,8 @@ func (c *fakeClient) Delete(ctx context.Context, obj client.Object, opts ...clie } delOptions := client.DeleteOptions{} delOptions.ApplyOptions(opts) + now := metav1.Now() + obj.SetDeletionTimestamp(&now) for _, dryRunOpt := range delOptions.DryRun { if dryRunOpt == metav1.DryRunAll { diff --git a/pkg/client/metadata_client.go b/pkg/client/metadata_client.go index d0c6b8e13a..4b9daeb301 100644 --- a/pkg/client/metadata_client.go +++ b/pkg/client/metadata_client.go @@ -63,6 +63,8 @@ func (mc *metadataClient) Delete(ctx context.Context, obj Object, opts ...Delete deleteOpts := DeleteOptions{} deleteOpts.ApplyOptions(opts) + now := metav1.Now() + metadata.SetDeletionTimestamp(&now) return resInt.Delete(ctx, metadata.Name, *deleteOpts.AsDeleteOptions()) } diff --git a/pkg/client/typed_client.go b/pkg/client/typed_client.go index 92afd9a9c2..59970ea2e9 100644 --- a/pkg/client/typed_client.go +++ b/pkg/client/typed_client.go @@ -19,6 +19,7 @@ package client import ( "context" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -78,6 +79,8 @@ func (c *typedClient) Delete(ctx context.Context, obj Object, opts ...DeleteOpti deleteOpts := DeleteOptions{} deleteOpts.ApplyOptions(opts) + now := metav1.Now() + o.SetDeletionTimestamp(&now) return o.Delete(). NamespaceIfScoped(o.GetNamespace(), o.isNamespaced()). diff --git a/pkg/client/unstructured_client.go b/pkg/client/unstructured_client.go index 0d96951780..f9c986fd67 100644 --- a/pkg/client/unstructured_client.go +++ b/pkg/client/unstructured_client.go @@ -21,6 +21,7 @@ import ( "fmt" "strings" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -104,6 +105,8 @@ func (uc *unstructuredClient) Delete(ctx context.Context, obj Object, opts ...De deleteOpts := DeleteOptions{} deleteOpts.ApplyOptions(opts) + now := metav1.Now() + o.SetDeletionTimestamp(&now) return o.Delete(). NamespaceIfScoped(o.GetNamespace(), o.isNamespaced()).