From 128fddcb8c6b044c8ca37c99636c33d584e6b33d Mon Sep 17 00:00:00 2001 From: "Charel Baum (external expert on behalf of DB InfraGO AG)" Date: Thu, 15 Feb 2024 10:40:31 +0100 Subject: [PATCH] fix(database): skip isUpToDate on deletion Signed-off-by: Charel Baum (external expert on behalf of DB InfraGO AG) --- pkg/controller/database/rdsinstance/rdsinstance.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/controller/database/rdsinstance/rdsinstance.go b/pkg/controller/database/rdsinstance/rdsinstance.go index 82777131fe..42bab8638f 100644 --- a/pkg/controller/database/rdsinstance/rdsinstance.go +++ b/pkg/controller/database/rdsinstance/rdsinstance.go @@ -161,13 +161,16 @@ func (e *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex cr.Status.SetConditions(xpv1.Unavailable()) } - var upToDate bool - var diff string + upToDate := true + diff := "" - upToDate, diff, e.cache.AddTags, e.cache.RemoveTags, err = rds.IsUpToDate(ctx, e.kube, cr, instance) + if !meta.WasDeleted(cr) { // There is no need to run isUpToDate if the resource is deleted - if err != nil { - return managed.ExternalObservation{}, errorutils.Wrap(err, errUpToDateFailed) + upToDate, diff, e.cache.AddTags, e.cache.RemoveTags, err = rds.IsUpToDate(ctx, e.kube, cr, instance) + + if err != nil { + return managed.ExternalObservation{}, errorutils.Wrap(err, errUpToDateFailed) + } } return managed.ExternalObservation{