Skip to content

Commit 5599bda

Browse files
committed
review fixes
1 parent 2f550be commit 5599bda

File tree

4 files changed

+739
-785
lines changed

4 files changed

+739
-785
lines changed

controllers/gateway/eventhandlers/tcp_route_events.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,4 @@ func (h *enqueueRequestsForTCPRouteEvent) enqueueImpactedGateways(ctx context.Co
6969
"gateway", gw)
7070
queue.Add(reconcile.Request{NamespacedName: gw})
7171
}
72-
73-
gateways, err = gatewayutils.GetImpactedGatewaysFromBackendRefs(ctx, h.k8sClient, route.Spec.Rules, route.Namespace, constants.NLBGatewayController)
74-
if err != nil {
75-
h.logger.V(1).Info("ignoring unknown gateways referred by", "tcproute", route.Name, "error", err)
76-
}
77-
for _, gw := range gateways {
78-
h.logger.V(1).Info("enqueue gateway for tcproute event",
79-
"tcproute", k8s.NamespacedName(route),
80-
"gateway", gw)
81-
queue.Add(reconcile.Request{NamespacedName: gw})
82-
}
83-
8472
}

pkg/deploy/elbv2/frontend_nlb_target_synthesizer.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ type frontendNlbTargetSynthesizer struct {
4949

5050
// Synthesize processes AWS target groups and deregisters ALB targets based on the desired state.
5151
func (s *frontendNlbTargetSynthesizer) Synthesize(ctx context.Context) error {
52+
5253
var resTGs []*elbv2model.TargetGroup
5354
s.stack.ListResources(&resTGs)
5455
res := s.findSDKTargetGroups()
@@ -109,6 +110,10 @@ func (s *frontendNlbTargetSynthesizer) deregisterCurrentTarget(ctx context.Conte
109110
}
110111

111112
func (s *frontendNlbTargetSynthesizer) PostSynthesize(ctx context.Context) error {
113+
if s.frontendNlbTargetGroupDesiredState == nil {
114+
return nil
115+
}
116+
112117
var resTGs []*elbv2model.TargetGroup
113118
s.stack.ListResources(&resTGs)
114119

pkg/gateway/gatewayutils/gateway_utils.go

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"sigs.k8s.io/aws-load-balancer-controller/pkg/gateway/constants"
1010
"sigs.k8s.io/controller-runtime/pkg/client"
1111
gwv1 "sigs.k8s.io/gateway-api/apis/v1"
12-
gwalpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
1312
)
1413

1514
// IsGatewayManagedByLBController checks if a Gateway is managed by the ALB/NLB Gateway Controller
@@ -104,48 +103,6 @@ func GetImpactedGatewaysFromParentRefs(ctx context.Context, k8sClient client.Cli
104103
return impactedGateways, err
105104
}
106105

107-
func GetImpactedGatewaysFromBackendRefs(ctx context.Context, k8sClient client.Client, tcpRoutes []gwalpha2.TCPRouteRule, resourceNamespace string, gwController string) ([]types.NamespacedName, error) {
108-
resultSet := sets.New[types.NamespacedName]()
109-
processedSet := sets.New[types.NamespacedName]()
110-
errorSet := sets.New[types.NamespacedName]()
111-
for _, route := range tcpRoutes {
112-
for _, ref := range route.BackendRefs {
113-
if ref.Kind == nil || *ref.Kind != "Gateway" {
114-
continue
115-
}
116-
117-
ns := resourceNamespace
118-
if ref.Namespace != nil {
119-
ns = string(*ref.Namespace)
120-
}
121-
nsn := types.NamespacedName{
122-
Namespace: ns,
123-
Name: string(ref.Name),
124-
}
125-
if processedSet.Has(nsn) {
126-
continue
127-
}
128-
129-
gw := &gwv1.Gateway{}
130-
if err := k8sClient.Get(ctx, nsn, gw); err != nil {
131-
// Ignore and continue processing other refs
132-
errorSet.Insert(nsn)
133-
continue
134-
}
135-
processedSet.Insert(nsn)
136-
137-
if IsGatewayManagedByLBController(ctx, k8sClient, gw, gwController) {
138-
resultSet.Insert(nsn)
139-
}
140-
}
141-
}
142-
var err error
143-
if resultSet.Len() > 0 {
144-
err = fmt.Errorf("failed to list gateways, %s", resultSet.UnsortedList())
145-
}
146-
return resultSet.UnsortedList(), err
147-
}
148-
149106
// GetImpactedGatewayClassesFromLbConfig identifies GatewayClasses affected by LoadBalancer configuration changes.
150107
// Returns GatewayClasses that reference the specified LoadBalancer configuration.
151108
func GetImpactedGatewayClassesFromLbConfig(ctx context.Context, k8sClient client.Client, lbconfig *elbv2gw.LoadBalancerConfiguration, gwControllers sets.Set[string]) (map[string]*gwv1.GatewayClass, error) {

0 commit comments

Comments
 (0)