Skip to content

Add TargetGroupBinding networking rule for healthcheck port #1445

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 2 commits into from
Sep 25, 2020
Merged

Add TargetGroupBinding networking rule for healthcheck port #1445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4148853
refactor NLB model builder
kishorj Sep 24, 2020
87141ec
Add TargetGroupBinding networking rule for healthcheck port
kishorj Sep 25, 2020
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
16 changes: 8 additions & 8 deletions controllers/service/service_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ const (
func NewServiceReconciler(cloud aws.Cloud, k8sClient client.Client,
sgManager networking.SecurityGroupManager, sgReconciler networking.SecurityGroupReconciler,
clusterName string, resolver networking.SubnetsResolver, logger logr.Logger) *ServiceReconciler {
annotationParser := annotations.NewSuffixAnnotationParser(ServiceAnnotationPrefix)
modelBuilder := nlb.NewDefaultModelBuilder(resolver, annotationParser)
return &ServiceReconciler{
k8sClient: k8sClient,
logger: logger,
annotationParser: annotations.NewSuffixAnnotationParser(ServiceAnnotationPrefix),
annotationParser: annotationParser,
finalizerManager: k8s.NewDefaultFinalizerManager(k8sClient, logger),
subnetsResolver: resolver,
modelBuilder: modelBuilder,
stackMarshaller: deploy.NewDefaultStackMarshaller(),
stackDeployer: deploy.NewDefaultStackDeployer(cloud, k8sClient, sgManager, sgReconciler, clusterName, DefaultTagPrefix, logger),
}
Expand All @@ -47,10 +49,9 @@ type ServiceReconciler struct {
logger logr.Logger
annotationParser annotations.Parser
finalizerManager k8s.FinalizerManager
subnetsResolver networking.SubnetsResolver

stackMarshaller deploy.StackMarshaller
stackDeployer deploy.StackDeployer
modelBuilder nlb.ModelBuilder
stackMarshaller deploy.StackMarshaller
stackDeployer deploy.StackDeployer
}

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

func (r *ServiceReconciler) buildAndDeployModel(ctx context.Context, svc *corev1.Service) (core.Stack, *elbv2model.LoadBalancer, error) {
nlbBuilder := nlb.NewServiceBuilder(svc, r.subnetsResolver, r.annotationParser)
stack, lb, err := nlbBuilder.Build(ctx)
stack, lb, err := r.modelBuilder.Build(ctx, svc)
if err != nil {
return nil, nil, err
}
Expand Down
Loading