Skip to content

Commit c3377c2

Browse files
committed
CLEANUP/MINOR: use distinct temp variables for route matching
Replace the generic `TMP` variable with `tmp_exact` and `tmp_wild` in both HTTP and TLS passthrough frontend rule generation. This prevents potential variable conflicts and improves the clarity of exact and wildcard listener route matching logic in the HAProxy configuration. Additionally, it updates a stale comment to correctly reflect the wildcard matching map.
1 parent c81c70f commit c3377c2

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

k8s/gate/haproxy/frontends.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -270,34 +270,34 @@ func (b *HaproxyConfMgrImpl) newFrontend(vListenerName string, vListener *tree.V
270270
// Look for route name: selected_listener_route
271271
{
272272
// listener-route-name exact match
273-
// http-request set-var(txn.TMP) var(txn.selected_listener_name),concat("/",txn.host)
274-
// http-request set-var(txn.selected_listener_route) var(txn.TMP),map(listener_route_exact_match)
273+
// http-request set-var(txn.tmp_exact) var(txn.selected_listener_name),concat("/",txn.host)
274+
// http-request set-var(txn.selected_listener_route) var(txn.tmp_exact),map(listener_route_exact_match)
275275
Type: "set-var",
276-
VarName: "TMP",
276+
VarName: "tmp_exact",
277277
VarScope: "txn",
278278
VarExpr: "var(txn.selected_listener_name),concat(\"/\",txn.host)",
279279
},
280280
{
281281
Type: "set-var",
282282
VarName: "selected_listener_route,ifnotexists",
283283
VarScope: "txn",
284-
VarExpr: "var(txn.TMP),map(" + listenerRouteExactMatchMap.Path.FullPath() + ")",
284+
VarExpr: "var(txn.tmp_exact),map(" + listenerRouteExactMatchMap.Path.FullPath() + ")",
285285
Metadata: map[string]any{"hug": "listener-route exact match selection"},
286286
},
287287
{
288288
// listener-route-name wildcard match
289-
// http-request set-var(txn.TMP) var(txn.selected_listener_name),concat("/",txn.hostreversed)
290-
// http-request set-var(txn.selected_listener_route) var(txn.TMP),map(listener_route_exact_match)
289+
// http-request set-var(txn.tmp_wild) var(txn.selected_listener_name),concat("/",txn.hostreversed)
290+
// http-request set-var(txn.selected_listener_route) var(txn.tmp_wild),map_beg(listener_route_wildcard_match)
291291
Type: "set-var",
292-
VarName: "TMP",
292+
VarName: "tmp_wild",
293293
VarScope: "txn",
294294
VarExpr: "var(txn.selected_listener_name),concat(\"/\",txn.hostreversed)",
295295
},
296296
{
297297
Type: "set-var",
298298
VarName: "selected_listener_route,ifnotexists",
299299
VarScope: "txn",
300-
VarExpr: "var(txn.TMP),map_beg(" + listenerRouteWildcardMatchMap.Path.FullPath() + ")",
300+
VarExpr: "var(txn.tmp_wild),map_beg(" + listenerRouteWildcardMatchMap.Path.FullPath() + ")",
301301
Metadata: map[string]any{"hug": "listener-route wildcard match selection"},
302302
},
303303
// -------------------
@@ -549,10 +549,10 @@ func tlsPassthroughRules(
549549
Metadata: map[string]any{"hug": "listener wildcard match selection"},
550550
},
551551
{
552-
// tcp-request content set-var(sess.TMP) var(sess.selected_listener_name),concat("/",sess.sni)
552+
// tcp-request content set-var(sess.tmp_exact) var(sess.selected_listener_name),concat("/",sess.sni)
553553
Type: "content",
554554
Action: "set-var",
555-
VarName: "TMP",
555+
VarName: "tmp_exact",
556556
VarScope: "sess",
557557
Expr: "var(sess.selected_listener_name),concat(\"/\",sess.sni)",
558558
},
@@ -561,14 +561,14 @@ func tlsPassthroughRules(
561561
Action: "set-var",
562562
VarName: "selected_listener_route",
563563
VarScope: "sess",
564-
Expr: "var(sess.TMP),map(" + listenerRouteExactMatch + ")",
564+
Expr: "var(sess.tmp_exact),map(" + listenerRouteExactMatch + ")",
565565
Metadata: map[string]any{"hug": "listener-route exact match selection"},
566566
},
567567
{
568-
// tcp-request content set-var(sess.TMP) var(sess.selected_listener_name),concat("/",sess.snireversed)
568+
// tcp-request content set-var(sess.tmp_wild) var(sess.selected_listener_name),concat("/",sess.snireversed)
569569
Type: "content",
570570
Action: "set-var",
571-
VarName: "TMP",
571+
VarName: "tmp_wild",
572572
VarScope: "sess",
573573
Expr: "var(sess.selected_listener_name),concat(\"/\",sess.snireversed)",
574574
},
@@ -577,7 +577,7 @@ func tlsPassthroughRules(
577577
Action: "set-var",
578578
VarName: "selected_listener_route,ifnotexists",
579579
VarScope: "sess",
580-
Expr: "var(sess.TMP),map_beg(" + listenerRouteWildcardMatch + ")",
580+
Expr: "var(sess.tmp_wild),map_beg(" + listenerRouteWildcardMatch + ")",
581581
Metadata: map[string]any{"hug": "listener-route wildcard match selection"},
582582
},
583583
{

0 commit comments

Comments
 (0)