Skip to content

Add cert discovery #4159

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
merged 1 commit into from
Apr 30, 2025
Merged

Add cert discovery #4159

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion controllers/gateway/gateway_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func NewALBGatewayReconciler(routeLoader routeutils.Loader, cloud services.Cloud
func newGatewayReconciler(controllerName string, lbType elbv2model.LoadBalancerType, maxConcurrentReconciles int, gatewayTagPrefix string, finalizer string, routeLoader routeutils.Loader, routeFilter routeutils.LoadRouteFilter, cloud services.Cloud, k8sClient client.Client, eventRecorder record.EventRecorder, controllerConfig config.ControllerConfig, finalizerManager k8s.FinalizerManager, networkingSGReconciler networking.SecurityGroupReconciler, networkingSGManager networking.SecurityGroupManager, elbv2TaggingManager elbv2deploy.TaggingManager, subnetResolver networking.SubnetsResolver, vpcInfoProvider networking.VPCInfoProvider, backendSGProvider networking.BackendSGProvider, sgResolver networking.SecurityGroupResolver, logger logr.Logger, metricsCollector lbcmetrics.MetricCollector, reconcileTracker func(namespaceName types.NamespacedName)) Reconciler {

trackingProvider := tracking.NewDefaultProvider(gatewayTagPrefix, controllerConfig.ClusterName)
modelBuilder := gatewaymodel.NewModelBuilder(subnetResolver, vpcInfoProvider, cloud.VpcID(), lbType, trackingProvider, elbv2TaggingManager, controllerConfig, cloud.EC2(), controllerConfig.FeatureGates, controllerConfig.ClusterName, controllerConfig.DefaultTags, sets.New(controllerConfig.ExternalManagedTags...), controllerConfig.DefaultSSLPolicy, controllerConfig.DefaultTargetType, controllerConfig.DefaultLoadBalancerScheme, backendSGProvider, sgResolver, controllerConfig.EnableBackendSecurityGroup, controllerConfig.DisableRestrictedSGRules, logger)
modelBuilder := gatewaymodel.NewModelBuilder(subnetResolver, vpcInfoProvider, cloud.VpcID(), lbType, trackingProvider, elbv2TaggingManager, controllerConfig, cloud.EC2(), cloud.ACM(), controllerConfig.FeatureGates, controllerConfig.ClusterName, controllerConfig.DefaultTags, sets.New(controllerConfig.ExternalManagedTags...), controllerConfig.DefaultSSLPolicy, controllerConfig.DefaultTargetType, controllerConfig.DefaultLoadBalancerScheme, backendSGProvider, sgResolver, controllerConfig.EnableBackendSecurityGroup, controllerConfig.DisableRestrictedSGRules, controllerConfig.IngressConfig.AllowedCertificateAuthorityARNs, logger)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: We should move AllowedCertificateAuthorityARNs to common config if its used by multiple controllers and not just Ingress specific.


stackMarshaller := deploy.NewDefaultStackMarshaller()
stackDeployer := deploy.NewDefaultStackDeployer(cloud, k8sClient, networkingSGManager, networkingSGReconciler, elbv2TaggingManager, controllerConfig, gatewayTagPrefix, logger, metricsCollector, controllerName)
Expand Down
9 changes: 5 additions & 4 deletions pkg/ingress/cert_discovery.go → pkg/certs/cert_discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package ingress
package certs

import (
"context"
"strings"
"sync"
"time"

awssdk "github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/acm"
acmTypes "github.com/aws/aws-sdk-go-v2/service/acm/types"
Expand All @@ -13,9 +17,6 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/utils/strings/slices"
"sigs.k8s.io/aws-load-balancer-controller/pkg/aws/services"
"strings"
"sync"
"time"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/ingress/cert_discovery_mocks.go → pkg/certs/cert_discovery_mocks.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions pkg/ingress/cert_discovery_test.go → pkg/certs/cert_discovery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package ingress
package certs

import (
"github.com/stretchr/testify/assert"
"testing"

"github.com/stretchr/testify/assert"
)

func Test_acmCertDiscovery_domainMatchesHost(t *testing.T) {
Expand Down
15 changes: 10 additions & 5 deletions pkg/gateway/model/base_model_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package model

import (
"context"
"strconv"

"github.com/go-logr/logr"
"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/util/sets"
Expand All @@ -19,7 +21,6 @@ import (
"sigs.k8s.io/aws-load-balancer-controller/pkg/networking"
"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"
gwv1 "sigs.k8s.io/gateway-api/apis/v1"
"strconv"
)

// Builder builds the model stack for a Gateway resource.
Expand All @@ -31,10 +32,10 @@ type Builder interface {
// NewModelBuilder construct a new baseModelBuilder
func NewModelBuilder(subnetsResolver networking.SubnetsResolver,
vpcInfoProvider networking.VPCInfoProvider, vpcID string, loadBalancerType elbv2model.LoadBalancerType, trackingProvider tracking.Provider,
elbv2TaggingManager elbv2deploy.TaggingManager, lbcConfig config.ControllerConfig, ec2Client services.EC2, featureGates config.FeatureGates, clusterName string, defaultTags map[string]string,
elbv2TaggingManager elbv2deploy.TaggingManager, lbcConfig config.ControllerConfig, ec2Client services.EC2, acmClient services.ACM, featureGates config.FeatureGates, clusterName string, defaultTags map[string]string,
externalManagedTags sets.Set[string], defaultSSLPolicy string, defaultTargetType string, defaultLoadBalancerScheme string,
backendSGProvider networking.BackendSGProvider, sgResolver networking.SecurityGroupResolver, enableBackendSG bool,
disableRestrictedSGRules bool, logger logr.Logger) Builder {
disableRestrictedSGRules bool, allowedCAARNs []string, logger logr.Logger) Builder {

gwTagHelper := newTagHelper(sets.New(lbcConfig.ExternalManagedTags...), lbcConfig.DefaultTags)
subnetBuilder := newSubnetModelBuilder(loadBalancerType, trackingProvider, subnetsResolver, elbv2TaggingManager)
Expand All @@ -51,6 +52,7 @@ func NewModelBuilder(subnetsResolver networking.SubnetsResolver,
elbv2TaggingManager: elbv2TaggingManager,
featureGates: featureGates,
ec2Client: ec2Client,
acmClient: acmClient,
subnetBuilder: subnetBuilder,
securityGroupBuilder: sgBuilder,
loadBalancerType: loadBalancerType,
Expand All @@ -65,6 +67,7 @@ func NewModelBuilder(subnetsResolver networking.SubnetsResolver,

defaultLoadBalancerScheme: elbv2model.LoadBalancerScheme(defaultLoadBalancerScheme),
defaultIPType: elbv2model.IPAddressTypeIPV4,
allowedCAARNs: allowedCAARNs,
}
}

Expand All @@ -89,6 +92,8 @@ type baseModelBuilder struct {
defaultTargetType string
disableRestrictedSGRules bool
ec2Client services.EC2
acmClient services.ACM
allowedCAARNs []string
metricsCollector lbcmetrics.MetricCollector
lbBuilder loadBalancerBuilder
gwTagHelper tagHelper
Expand All @@ -105,7 +110,7 @@ type baseModelBuilder struct {
func (baseBuilder *baseModelBuilder) Build(ctx context.Context, gw *gwv1.Gateway, lbConf *elbv2gw.LoadBalancerConfiguration, routes map[int32][]routeutils.RouteDescriptor) (core.Stack, *elbv2model.LoadBalancer, bool, error) {
stack := core.NewDefaultStack(core.StackID(k8s.NamespacedName(gw)))
tgBuilder := newTargetGroupBuilder(baseBuilder.clusterName, baseBuilder.vpcID, baseBuilder.gwTagHelper, baseBuilder.loadBalancerType, baseBuilder.disableRestrictedSGRules, baseBuilder.defaultTargetType)
listenerBuilder := newListenerBuilder(baseBuilder.loadBalancerType, tgBuilder, baseBuilder.gwTagHelper, baseBuilder.clusterName, baseBuilder.defaultSSLPolicy, baseBuilder.logger)
listenerBuilder := newListenerBuilder(ctx, baseBuilder.loadBalancerType, tgBuilder, baseBuilder.gwTagHelper, baseBuilder.clusterName, baseBuilder.defaultSSLPolicy, baseBuilder.acmClient, baseBuilder.allowedCAARNs, baseBuilder.logger)
if gw.DeletionTimestamp != nil && !gw.DeletionTimestamp.IsZero() {
if baseBuilder.isDeleteProtected(lbConf) {
return nil, nil, false, errors.Errorf("Unable to delete gateway %+v because deletion protection is enabled.", k8s.NamespacedName(gw))
Expand Down Expand Up @@ -151,7 +156,7 @@ func (baseBuilder *baseModelBuilder) Build(ctx context.Context, gw *gwv1.Gateway

lb := elbv2model.NewLoadBalancer(stack, resourceIDLoadBalancer, spec)

if err := listenerBuilder.buildListeners(stack, lb, securityGroups, gw, routes, lbConf); err != nil {
if err := listenerBuilder.buildListeners(ctx, stack, lb, securityGroups, gw, routes, lbConf); err != nil {
return nil, nil, false, err
}

Expand Down
Loading
Loading