fix: the timeout on HTTPRoute overwrites the timeout on BTP

Signed-off-by: Kensei Nakada <handbomusic@gmail.com>
envoyproxy · Oct 5, 2024 · 087d441 · 087d441
1 parent 9214d8d
commit 087d441
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/internal/gatewayapi/clustersettings.go b/internal/gatewayapi/clustersettings.go
@@ -81,11 +81,11 @@ func translateTrafficFeatures(policy *egv1a1.ClusterSettings) (*ir.TrafficFeatur
 	return ret, nil
 }
 
-func buildClusterSettingsTimeout(policy egv1a1.ClusterSettings, traffic *ir.TrafficFeatures) (*ir.Timeout, error) {
+func buildClusterSettingsTimeout(policy egv1a1.ClusterSettings, routeTrafficFeatures *ir.TrafficFeatures) (*ir.Timeout, error) {
 	if policy.Timeout == nil {
-		if traffic != nil {
+		if routeTrafficFeatures != nil {
 			// Don't lose any existing timeout definitions.
-			return mergeTimeoutSettings(nil, traffic.Timeout), nil
+			return mergeTimeoutSettings(nil, routeTrafficFeatures.Timeout), nil
 		}
 		return nil, nil
 	}
@@ -145,13 +145,11 @@ func buildClusterSettingsTimeout(policy egv1a1.ClusterSettings, traffic *ir.Traf
 		}
 	}
 
-	// http request timeout is translated during the gateway-api route resource translation
-	// merge route timeout setting with backendtrafficpolicy timeout settings.
-	// Merging is done after the clustersettings definitions are translated so that
-	// clustersettings will override previous settings.
-	if traffic != nil {
-		to = mergeTimeoutSettings(to, traffic.Timeout)
+	// The timeout from route's TrafficFeatures takes precedence over the timeout in BTP
+	if routeTrafficFeatures != nil {
+		to = mergeTimeoutSettings(routeTrafficFeatures.Timeout, to)
 	}
+
 	return to, errs
 }
 

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.in.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.in.yaml
@@ -62,6 +62,8 @@ httpRoutes:
       backendRefs:
       - name: service-1
         port: 8080
+      timeouts:
+        request: 1s
 backendTrafficPolicies:
 - apiVersion: gateway.envoyproxy.io/v1alpha1
   kind: BackendTrafficPolicy

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml
@@ -197,6 +197,8 @@ httpRoutes:
     - backendRefs:
       - name: service-1
         port: 8080
+      timeouts:
+        request: 1s
       matches:
       - path:
           value: /
@@ -339,6 +341,6 @@ xdsIR:
             http:
               connectionIdleTimeout: 21s
               maxConnectionDuration: 22s
-              requestTimeout: 23s
+              requestTimeout: 1s # Overwritten by the request timeout in HTTPRoute
             tcp:
               connectTimeout: 20s