chore: remove tcp options from the UDPRoute IR (envoyproxy#4084)

* remove tcp options from the UDPRoute IR Signed-off-by: Huabing Zhao <[email protected]> * fix check Signed-off-by: Huabing Zhao <[email protected]> --------- Signed-off-by: Huabing Zhao <[email protected]>
shahar-h · Aug 22, 2024 · ada279e · ada279e
1 parent 2c54de2
commit ada279e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 39 deletions.
diff --git a/internal/gatewayapi/backendtrafficpolicy.go b/internal/gatewayapi/backendtrafficpolicy.go
@@ -372,8 +372,6 @@ func (t *Translator) translateBackendTrafficPolicyForRoute(policy *egv1a1.Backen
 
 				if strings.HasPrefix(r.Destination.Name, prefix) {
 					r.LoadBalancer = lb
-					r.Timeout = to
-					r.BackendConnection = bc
 					r.DNS = ds
 				}
 			}
@@ -518,7 +516,6 @@ func (t *Translator) translateBackendTrafficPolicyForGateway(policy *egv1a1.Back
 		// only set attributes which weren't already set by a more
 		// specific policy
 		setIfNil(&route.LoadBalancer, lb)
-		setIfNil(&route.Timeout, ct)
 		setIfNil(&route.DNS, ds)
 	}
 

diff --git a/...gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml b/...gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml
@@ -309,9 +309,3 @@ xdsIR:
           consistentHash:
             sourceIP: true
         name: udproute/default/udp-app-1
-        timeout:
-          http:
-            connectionIdleTimeout: 16s
-            maxConnectionDuration: 17s
-          tcp:
-            connectTimeout: 15s
diff --git a/...l/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml b/...l/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml
@@ -382,9 +382,3 @@ xdsIR:
           consistentHash:
             sourceIP: true
         name: udproute/default/udp-app-1
-        timeout:
-          http:
-            connectionIdleTimeout: 16s
-            maxConnectionDuration: 17s
-          tcp:
-            connectTimeout: 15s
diff --git a/internal/ir/xds.go b/internal/ir/xds.go
@@ -1556,10 +1556,6 @@ type UDPRoute struct {
 	Destination *RouteDestination `json:"destination,omitempty" yaml:"destination,omitempty"`
 	// load balancer policy to use when routing to the backend endpoints.
 	LoadBalancer *LoadBalancer `json:"loadBalancer,omitempty" yaml:"loadBalancer,omitempty"`
-	// Request and connection timeout settings
-	Timeout *Timeout `json:"timeout,omitempty" yaml:"timeout,omitempty"`
-	// settings of upstream connection
-	BackendConnection *BackendConnection `json:"backendConnection,omitempty" yaml:"backendConnection,omitempty"`
 	// DNS is used to configure how DNS resolution is handled by the Envoy Proxy cluster
 	DNS *DNS `json:"dns,omitempty" yaml:"dns,omitempty"`
 }

diff --git a/internal/ir/zz_generated.deepcopy.go b/internal/ir/zz_generated.deepcopy.go
diff --git a/internal/xds/translator/cluster.go b/internal/xds/translator/cluster.go
@@ -686,15 +686,12 @@ type UDPRouteTranslator struct {
 
 func (route *UDPRouteTranslator) asClusterArgs(extra *ExtraArgs) *xdsClusterArgs {
 	return &xdsClusterArgs{
-		name:              route.Destination.Name,
-		settings:          route.Destination.Settings,
-		loadBalancer:      route.LoadBalancer,
-		timeout:           route.Timeout,
-		tSocket:           nil,
-		endpointType:      buildEndpointType(route.Destination.Settings),
-		metrics:           extra.metrics,
-		backendConnection: route.BackendConnection,
-		dns:               route.DNS,
+		name:         route.Destination.Name,
+		settings:     route.Destination.Settings,
+		loadBalancer: route.LoadBalancer,
+		endpointType: buildEndpointType(route.Destination.Settings),
+		metrics:      extra.metrics,
+		dns:          route.DNS,
 	}
 }
 

diff --git a/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/backend-buffer-limit.clusters.yaml
@@ -47,5 +47,5 @@
   lbPolicy: LEAST_REQUEST
   name: udp-route-dest
   outlierDetection: {}
-  perConnectionBufferLimitBytes: 100000000
+  perConnectionBufferLimitBytes: 32768
   type: EDS