Skip to content

For orphaned certificates if we have an issue listing just log the error #16096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow merged 1 commit into from
Sep 26, 2025
Merged

For orphaned certificates if we have an issue listing just log the error #16096

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 17 additions & 21 deletions pkg/reconciler/route/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"strings"
"time"

"go.uber.org/zap"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubelabels "k8s.io/apimachinery/pkg/labels"
Expand Down Expand Up @@ -310,12 +311,7 @@ func (c *Reconciler) externalDomainTLS(ctx context.Context, host string, r *v1.R
return acmeChallenges[i].URL.String() < acmeChallenges[j].URL.String()
})

orphanCerts, err := c.getOrphanRouteCerts(r, domainToTagMap, netcfg.CertificateExternalDomain)
if err != nil {
return nil, nil, desiredCerts, err
}

c.deleteOrphanedCerts(ctx, orphanCerts)
c.deleteOrphanRouteCerts(ctx, r, domainToTagMap, netcfg.CertificateExternalDomain)

return tls, acmeChallenges, desiredCerts, nil
}
Expand Down Expand Up @@ -363,26 +359,28 @@ func (c *Reconciler) clusterLocalDomainTLS(ctx context.Context, r *v1.Route, tc
}
}

orphanCerts, err := c.getOrphanRouteCerts(r, usedDomains, netcfg.CertificateClusterLocalDomain)
if err != nil {
//nolint:nilerr // https://github.com/knative/serving/issues/15755
return nil, nil
}

c.deleteOrphanedCerts(ctx, orphanCerts)
c.deleteOrphanRouteCerts(ctx, r, usedDomains, netcfg.CertificateClusterLocalDomain)

return tls, nil
}

// Returns a slice of certificates that used to belong route's old domains/tags for a specific visibility that are currently not in use.
func (c *Reconciler) getOrphanRouteCerts(r *v1.Route, domainToTagMap map[string]string, certificateType netcfg.CertificateType) ([]*netv1alpha1.Certificate, error) {
func (c *Reconciler) deleteOrphanRouteCerts(
ctx context.Context,
r *v1.Route,
domainToTagMap map[string]string,
certificateType netcfg.CertificateType,
) {
logger := logging.FromContext(ctx)

labelSelector := kubelabels.SelectorFromSet(kubelabels.Set{
serving.RouteLabelKey: r.Name,
})

certs, err := c.certificateLister.Certificates(r.Namespace).List(labelSelector)
if err != nil {
return nil, err
logger.Errorw("error listing orphaned certs for cleanup", zap.Error(err))
return
}

var unusedCerts []*netv1alpha1.Certificate
Expand All @@ -401,13 +399,11 @@ func (c *Reconciler) getOrphanRouteCerts(r *v1.Route, domainToTagMap map[string]
}
}

return unusedCerts, nil
}

func (c *Reconciler) deleteOrphanedCerts(ctx context.Context, orphanCerts []*netv1alpha1.Certificate) {
certClient := c.GetNetworkingClient().NetworkingV1alpha1()
recorder := controller.GetEventRecorder(ctx)
for _, cert := range orphanCerts {
err := c.GetNetworkingClient().NetworkingV1alpha1().Certificates(cert.Namespace).Delete(ctx, cert.Name, metav1.DeleteOptions{})

for _, cert := range unusedCerts {
err := certClient.Certificates(cert.Namespace).Delete(ctx, cert.Name, metav1.DeleteOptions{})
if err != nil {
recorder.Eventf(cert, corev1.EventTypeNormal, "DeleteFailed",
"Failed to delete orphaned Knative Certificate %s/%s: %v", cert.Namespace, cert.Name, err)
Expand Down
Loading