Skip to content

Commit

Permalink
fix: ca-filter causing expontentially more api-calls (#3608)
Browse files Browse the repository at this point in the history
due to missing cache
  • Loading branch information
the-technat committed Mar 13, 2024
1 parent b63a294 commit 20e667d
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions pkg/ingress/cert_discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package ingress

import (
"context"
"slices"
"strings"
"sync"
"time"
Expand All @@ -16,6 +15,7 @@ import (
"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/util/cache"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/utils/strings/slices"
"sigs.k8s.io/aws-load-balancer-controller/pkg/aws/services"
)

Expand Down Expand Up @@ -153,18 +153,18 @@ func (d *acmCertDiscovery) loadDomainsForCertificate(ctx context.Context, certAR
certDetail := resp.Certificate

// check if cert is issued from an allowed CA
// otherwise empty-out the list of domains
domains := sets.String{}
if len(d.allowedCAARNs) == 0 || slices.Contains(d.allowedCAARNs, awssdk.StringValue(certDetail.CertificateAuthorityArn)) {
domains := sets.NewString(aws.StringValueSlice(certDetail.SubjectAlternativeNames)...)
switch aws.StringValue(certDetail.Type) {
case acm.CertificateTypeImported:
d.certDomainsCache.Set(certARN, domains, d.importedCertDomainsCacheTTL)
case acm.CertificateTypeAmazonIssued, acm.CertificateTypePrivate:
d.certDomainsCache.Set(certARN, domains, d.privateCertDomainsCacheTTL)
}
return domains, nil
domains = sets.NewString(aws.StringValueSlice(certDetail.SubjectAlternativeNames)...)
}
return sets.String{}, nil

switch aws.StringValue(certDetail.Type) {
case acm.CertificateTypeImported:
d.certDomainsCache.Set(certARN, domains, d.importedCertDomainsCacheTTL)
case acm.CertificateTypeAmazonIssued, acm.CertificateTypePrivate:
d.certDomainsCache.Set(certARN, domains, d.privateCertDomainsCacheTTL)
}
return domains, nil
}

func (d *acmCertDiscovery) domainMatchesHost(domainName string, tlsHost string) bool {
Expand Down

0 comments on commit 20e667d

Please sign in to comment.