chore: set mergedGateways in translator runner (envoyproxy#2971)

* chore: set mergedGateways in translator runner Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> * fix tests Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> --------- Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>
guydc · Mar 20, 2024 · 655ee5d · 655ee5d
1 parent 6fa99be
commit 655ee5d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/internal/gatewayapi/helpers.go b/internal/gatewayapi/helpers.go
@@ -399,7 +399,7 @@ func irTLSCACertName(namespace, name string) string {
 	return fmt.Sprintf("%s/%s/%s", namespace, name, caCertKey)
 }
 
-func isMergeGatewaysEnabled(resources *Resources) bool {
+func IsMergeGatewaysEnabled(resources *Resources) bool {
 	return resources.EnvoyProxy != nil && resources.EnvoyProxy.Spec.MergeGateways != nil && *resources.EnvoyProxy.Spec.MergeGateways
 }
 

diff --git a/internal/gatewayapi/runner/runner.go b/internal/gatewayapi/runner/runner.go
@@ -84,6 +84,7 @@ func (r *Runner) subscribeAndTranslate(ctx context.Context) {
 					GlobalRateLimitEnabled:  r.EnvoyGateway.RateLimit != nil,
 					EnvoyPatchPolicyEnabled: r.EnvoyGateway.ExtensionAPIs != nil && r.EnvoyGateway.ExtensionAPIs.EnableEnvoyPatchPolicy,
 					Namespace:               r.Namespace,
+					MergeGateways:           gatewayapi.IsMergeGatewaysEnabled(resources),
 				}
 
 				// If an extension is loaded, pass its supported groups/kinds to the translator

diff --git a/internal/gatewayapi/translator.go b/internal/gatewayapi/translator.go
@@ -252,8 +252,7 @@ func (t *Translator) InitIRs(gateways []*GatewayContext, resources *Resources) (
 		annotations := infrastructureAnnotations(gateway.Gateway)
 		gwInfraIR.Proxy.GetProxyMetadata().Annotations = annotations
 
-		if isMergeGatewaysEnabled(resources) {
-			t.MergeGateways = true
+		if t.MergeGateways {
 			irKey = string(t.GatewayClassName)
 
 			maps.Copy(labels, GatewayClassOwnerLabel(string(t.GatewayClassName)))

diff --git a/internal/gatewayapi/translator_test.go b/internal/gatewayapi/translator_test.go
@@ -78,6 +78,7 @@ func TestTranslate(t *testing.T) {
 				GlobalRateLimitEnabled:  true,
 				EnvoyPatchPolicyEnabled: envoyPatchPolicyEnabled,
 				Namespace:               "envoy-gateway-system",
+				MergeGateways:           IsMergeGatewaysEnabled(resources),
 			}
 
 			// Add common test fixtures
@@ -270,6 +271,7 @@ func TestTranslateWithExtensionKinds(t *testing.T) {
 				GatewayClassName:       "envoy-gateway-class",
 				GlobalRateLimitEnabled: true,
 				ExtensionGroupKinds:    []schema.GroupKind{{Group: "foo.example.io", Kind: "Foo"}},
+				MergeGateways:          IsMergeGatewaysEnabled(resources),
 			}
 
 			// Add common test fixtures