Skip to content

Commit 1efa74b

Browse files
kishorjTimothy-Dougherty
authored andcommitted
Add TargetGroupBinding networking rule for healthcheck port (kubernetes-sigs#1445)
* refactor NLB model builder * Add TargetGroupBinding networking rule for healthcheck port
1 parent 548eab1 commit 1efa74b

File tree

3 files changed

+310
-177
lines changed

3 files changed

+310
-177
lines changed

controllers/service/service_controller.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@ const (
3131
func NewServiceReconciler(cloud aws.Cloud, k8sClient client.Client,
3232
sgManager networking.SecurityGroupManager, sgReconciler networking.SecurityGroupReconciler,
3333
clusterName string, resolver networking.SubnetsResolver, logger logr.Logger) *ServiceReconciler {
34+
annotationParser := annotations.NewSuffixAnnotationParser(ServiceAnnotationPrefix)
35+
modelBuilder := nlb.NewDefaultModelBuilder(resolver, annotationParser)
3436
return &ServiceReconciler{
3537
k8sClient: k8sClient,
3638
logger: logger,
37-
annotationParser: annotations.NewSuffixAnnotationParser(ServiceAnnotationPrefix),
39+
annotationParser: annotationParser,
3840
finalizerManager: k8s.NewDefaultFinalizerManager(k8sClient, logger),
39-
subnetsResolver: resolver,
41+
modelBuilder: modelBuilder,
4042
stackMarshaller: deploy.NewDefaultStackMarshaller(),
4143
stackDeployer: deploy.NewDefaultStackDeployer(cloud, k8sClient, sgManager, sgReconciler, clusterName, DefaultTagPrefix, logger),
4244
}
@@ -47,10 +49,9 @@ type ServiceReconciler struct {
4749
logger logr.Logger
4850
annotationParser annotations.Parser
4951
finalizerManager k8s.FinalizerManager
50-
subnetsResolver networking.SubnetsResolver
51-
52-
stackMarshaller deploy.StackMarshaller
53-
stackDeployer deploy.StackDeployer
52+
modelBuilder nlb.ModelBuilder
53+
stackMarshaller deploy.StackMarshaller
54+
stackDeployer deploy.StackDeployer
5455
}
5556

5657
// +kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch;update;patch
@@ -74,8 +75,7 @@ func (r *ServiceReconciler) reconcile(req ctrl.Request) error {
7475
}
7576

7677
func (r *ServiceReconciler) buildAndDeployModel(ctx context.Context, svc *corev1.Service) (core.Stack, *elbv2model.LoadBalancer, error) {
77-
nlbBuilder := nlb.NewServiceBuilder(svc, r.subnetsResolver, r.annotationParser)
78-
stack, lb, err := nlbBuilder.Build(ctx)
78+
stack, lb, err := r.modelBuilder.Build(ctx, svc)
7979
if err != nil {
8080
return nil, nil, err
8181
}

0 commit comments

Comments
 (0)