Skip to content

Commit e5b68b7

Browse files
committed
fix(ingress): existing tests pass
1 parent 9a218d9 commit e5b68b7

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

pkg/ingress/model_build_frontend_nlb.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func (t *defaultModelBuildTask) buildFrontendNlb(ctx context.Context, scheme elb
212212
return nil
213213
}
214214

215-
func (t *defaultModelBuildTask) buildFrontendNlbAttributes(ctx context.Context) ([]elbv2model.LoadBalancerAttribute, error) {
215+
func (t *defaultModelBuildTask) buildFrontendNlbAttributes() ([]elbv2model.LoadBalancerAttribute, error) {
216216
loadBalancerAttributes, err := t.getFrontendNlbAttributes()
217217
if err != nil {
218218
return []elbv2model.LoadBalancerAttribute{}, err
@@ -278,7 +278,7 @@ func (t *defaultModelBuildTask) buildFrontendNlbSpec(ctx context.Context, scheme
278278
return elbv2model.LoadBalancerSpec{}, err
279279
}
280280

281-
lbAttributes, err := t.buildFrontendNlbAttributes(ctx)
281+
lbAttributes, err := t.buildFrontendNlbAttributes()
282282
if err != nil {
283283
return elbv2model.LoadBalancerSpec{}, err
284284
}
@@ -854,7 +854,7 @@ func buildFrontendNlbResourceID(resourceType string, protocol elbv2model.Protoco
854854
if port != nil && protocol != "" {
855855
return fmt.Sprintf("FrontendNlb-%s-%v-%v", resourceType, protocol, *port)
856856
}
857-
return fmt.Sprintf("FrontendNlb")
857+
return "FrontendNlb"
858858
}
859859

860860
func mergeHealthCheckField[T comparable](fieldName string, finalValue **T, currentValue *T, explicit map[string]bool, explicitFields map[string]bool, configIndex int) error {

pkg/service/model_build_target_group.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
elbv2model "sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2"
2626
elbv2modelk8s "sigs.k8s.io/aws-load-balancer-controller/pkg/model/elbv2/k8s"
2727
"sigs.k8s.io/aws-load-balancer-controller/pkg/networking"
28-
"sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants"
2928
)
3029

3130
func (t *defaultModelBuildTask) buildTargetGroup(ctx context.Context, port corev1.ServicePort, tgProtocol elbv2model.Protocol, scheme elbv2model.LoadBalancerScheme) (*elbv2model.TargetGroup, error) {

0 commit comments

Comments
 (0)