Skip to content

Commit cf1b906

Browse files
author
Mykhailo Pechkurov
committed
fix: service instance deletion
1 parent e342b6b commit cf1b906

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

internal/controller/serviceinstance/controller.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func (c *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex
179179
var credentialsUpToDate bool
180180
desiredCredentials, err := extractCredentialSpec(ctx, c.kube, cr.Spec.ForProvider)
181181
if err != nil {
182-
return managed.ExternalObservation{}, errors.Wrap(err, errSecret)
182+
return managed.ExternalObservation{}, checkDelition(cr, errors.Wrap(err, errSecret))
183183
}
184184
// If parameter drift detection is enable, get actual credentials from the service instance
185185
if cr.Spec.EnableParameterDriftDetection {
@@ -209,6 +209,14 @@ func (c *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex
209209
}
210210
}
211211

212+
func checkDelition(cr *v1alpha1.ServiceInstance, err error) error {
213+
if cr.GetDeletionTimestamp() != nil {
214+
// we are in deletion, do not return error to avoid retry
215+
return nil
216+
}
217+
return err
218+
}
219+
212220
// Create attempts to create the external resource.
213221
func (c *external) Create(ctx context.Context, mg resource.Managed) (managed.ExternalCreation, error) {
214222
cr, ok := mg.(*v1alpha1.ServiceInstance)

0 commit comments

Comments
 (0)