@@ -31,12 +31,14 @@ const (
31
31
func NewServiceReconciler (cloud aws.Cloud , k8sClient client.Client ,
32
32
sgManager networking.SecurityGroupManager , sgReconciler networking.SecurityGroupReconciler ,
33
33
clusterName string , resolver networking.SubnetsResolver , logger logr.Logger ) * ServiceReconciler {
34
+ annotationParser := annotations .NewSuffixAnnotationParser (ServiceAnnotationPrefix )
35
+ modelBuilder := nlb .NewDefaultModelBuilder (resolver , annotationParser )
34
36
return & ServiceReconciler {
35
37
k8sClient : k8sClient ,
36
38
logger : logger ,
37
- annotationParser : annotations . NewSuffixAnnotationParser ( ServiceAnnotationPrefix ) ,
39
+ annotationParser : annotationParser ,
38
40
finalizerManager : k8s .NewDefaultFinalizerManager (k8sClient , logger ),
39
- subnetsResolver : resolver ,
41
+ modelBuilder : modelBuilder ,
40
42
stackMarshaller : deploy .NewDefaultStackMarshaller (),
41
43
stackDeployer : deploy .NewDefaultStackDeployer (cloud , k8sClient , sgManager , sgReconciler , clusterName , DefaultTagPrefix , logger ),
42
44
}
@@ -47,10 +49,9 @@ type ServiceReconciler struct {
47
49
logger logr.Logger
48
50
annotationParser annotations.Parser
49
51
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
54
55
}
55
56
56
57
// +kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch;update;patch
@@ -74,8 +75,7 @@ func (r *ServiceReconciler) reconcile(req ctrl.Request) error {
74
75
}
75
76
76
77
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 )
79
79
if err != nil {
80
80
return nil , nil , err
81
81
}
0 commit comments