feat: implement RequestTimeout in BackendTrafficPolicy

api/v1alpha1/timeout_types.go

@@ -40,6 +40,11 @@ type HTTPTimeout struct {
 	//
 	// +optional
 	MaxConnectionDuration *gwapiv1.Duration `json:"maxConnectionDuration,omitempty"`
+
+	// RequestTimeout is the time until which entire response is received from the upstream.
+	//
+	// +optional
+	RequestTimeout *gwapiv1.Duration `json:"requestTimeout,omitempty" yaml:"requestTimeout,omitempty"`
 }
 
 type ClientTimeout struct {

internal/gatewayapi/clustersettings.go

@@ -81,11 +81,11 @@
 	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
 	}
@@ -109,6 +109,7 @@
 	if pto.HTTP != nil {
 		var cit *metav1.Duration
 		var mcd *metav1.Duration
+		var rt *metav1.Duration
 
 		if pto.HTTP.ConnectionIdleTimeout != nil {
 			d, err := time.ParseDuration(string(*pto.HTTP.ConnectionIdleTimeout))
@@ -128,19 +129,27 @@
 			}
 		}
 
+		if pto.HTTP.RequestTimeout != nil {
+			d, err := time.ParseDuration(string(*pto.HTTP.RequestTimeout))
+			if err != nil {
+				errs = errors.Join(errs, fmt.Errorf("invalid RequestTimeout value %s", *pto.HTTP.RequestTimeout))
+			} else {
+				rt = ptr.To(metav1.Duration{Duration: d})
+			}
+		}
+
 		to.HTTP = &ir.HTTPTimeout{
 			ConnectionIdleTimeout: cit,
 			MaxConnectionDuration: mcd,
+			RequestTimeout:        rt,
 		}
 	}
 
-	// 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
 }
 

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
@@ -79,6 +81,7 @@ backendTrafficPolicies:
       http:
         connectionIdleTimeout: 16s
         maxConnectionDuration: 17s
+        requestTimeout: 18s
 - apiVersion: gateway.envoyproxy.io/v1alpha1
   kind: BackendTrafficPolicy
   metadata:
@@ -95,3 +98,4 @@ backendTrafficPolicies:
       http:
         connectionIdleTimeout: 21s
         maxConnectionDuration: 22s
+        requestTimeout: 23s

internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout.out.yaml

@@ -14,6 +14,7 @@
       http:
         connectionIdleTimeout: 21s
         maxConnectionDuration: 22s
+        requestTimeout: 23s
       tcp:
         connectTimeout: 20s
   status:
@@ -46,6 +47,7 @@
       http:
         connectionIdleTimeout: 16s
         maxConnectionDuration: 17s
+        requestTimeout: 18s
       tcp:
         connectTimeout: 15s
   status:
@@ -195,6 +197,8 @@
     - backendRefs:
       - name: service-1
         port: 8080
+      timeouts:
+        request: 1s
       matches:
       - path:
           value: /
@@ -289,6 +293,7 @@
             http:
               connectionIdleTimeout: 16s
               maxConnectionDuration: 17s
+              requestTimeout: 18s
             tcp:
               connectTimeout: 15s
   envoy-gateway/gateway-2:
@@ -336,5 +341,6 @@
             http:
               connectionIdleTimeout: 21s
               maxConnectionDuration: 22s
+              requestTimeout: 1s # Overwritten by the request timeout in HTTPRoute
             tcp:
               connectTimeout: 20s