Skip to content

Commit 912099a

Browse files
Merge pull request #1423 from stuggi/cleanup_route
[cert] cleanup cert when service annotation gets removed
2 parents 76625c2 + 0a81220 commit 912099a

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

pkg/openstack/common.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,15 @@ func (ed *EndpointDetail) ensureRoute(
451451
// Delete any other owner refs from ref list to not block deletion until owners are gone
452452
r.SetOwnerReferences([]metav1.OwnerReference{instanceRef})
453453

454+
// Delete certificate for the route
455+
if ed.Service.TLS.Enabled {
456+
err = DeleteCertificate(ctx, helper, instance.Namespace, ed.Route.TLS.CertName)
457+
if err != nil && !k8s_errors.IsNotFound(err) {
458+
err = fmt.Errorf("Error deleting route certificate %s: %w", ed.Route.TLS.CertName, err)
459+
return ctrl.Result{}, err
460+
}
461+
}
462+
454463
// Delete route
455464
err := helper.GetClient().Delete(ctx, &r)
456465
if err != nil && !k8s_errors.IsNotFound(err) {

0 commit comments

Comments
 (0)