Skip to content

Commit 3db8339

Browse files
committed
clean collectOrderedGateways function
1 parent 862c0a8 commit 3db8339

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

internal/controller/state/graph/backend_tls_policy.go

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,10 @@ func collectOrderedGateways(
216216
services map[types.NamespacedName]*ReferencedService,
217217
gateways map[types.NamespacedName]*Gateway,
218218
existingNGFGatewayAncestors map[types.NamespacedName]struct{},
219-
) (existingGateways []types.NamespacedName, newGateways []types.NamespacedName) {
219+
) []types.NamespacedName {
220220
seenGateways := make(map[types.NamespacedName]struct{})
221+
existingGateways := make([]types.NamespacedName, 0)
222+
newGateways := make([]types.NamespacedName, 0)
221223

222224
// Process services in spec order to maintain deterministic gateway ordering
223225
for _, refs := range policy.Spec.TargetRefs {
@@ -252,7 +254,8 @@ func collectOrderedGateways(
252254
sortGatewaysByCreationTime(existingGateways, gateways)
253255
sortGatewaysByCreationTime(newGateways, gateways)
254256

255-
return existingGateways, newGateways
257+
existingGateways = append(existingGateways, newGateways...)
258+
return existingGateways
256259
}
257260

258261
func extractExistingNGFGatewayAncestors(
@@ -288,11 +291,12 @@ func addGatewaysForBackendTLSPolicies(
288291
) {
289292
for _, backendTLSPolicy := range backendTLSPolicies {
290293
existingNGFGatewayAncestors := extractExistingNGFGatewayAncestors(backendTLSPolicy.Source, ctlrName)
291-
existingGateways, newGateways := collectOrderedGateways(
292-
backendTLSPolicy.Source, services, gateways, existingNGFGatewayAncestors)
293-
294-
existingGateways = append(existingGateways, newGateways...)
295-
orderedGateways := existingGateways
294+
orderedGateways := collectOrderedGateways(
295+
backendTLSPolicy.Source,
296+
services,
297+
gateways,
298+
existingNGFGatewayAncestors,
299+
)
296300

297301
ancestorCount := countNonNGFAncestors(backendTLSPolicy.Source, ctlrName)
298302

0 commit comments

Comments
 (0)