add xds configuration

Signed-off-by: Karol Szwaj <[email protected]>
envoyproxy · May 3, 2024 · 15f536d · 15f536d
1 parent a0064a8
commit 15f536d
Show file tree

Hide file tree

Showing 136 changed files with 412 additions and 218 deletions.
diff --git a/internal/gatewayapi/route.go b/internal/gatewayapi/route.go
@@ -657,11 +657,9 @@ func (t *Translator) processHTTPRouteParentRefListener(route RouteContext, route
 					Timeout:               routeRoute.Timeout,
 					Retry:                 routeRoute.Retry,
 					IsHTTP2:               routeRoute.IsHTTP2,
+					BackendWeights:        routeRoute.BackendWeights,
 				}
-				// Don't bother copying over the weights unless the route has invalid backends.
-				if routeRoute.BackendWeights.Invalid > 0 {
-					hostRoute.BackendWeights = routeRoute.BackendWeights
-				}
+
 				perHostRoutes = append(perHostRoutes, hostRoute)
 			}
 		}
@@ -1173,7 +1171,6 @@ func (t *Translator) processDestination(backendRefContext BackendRefContext,
 	if backendFilters != nil {
 		httpFiltersContext := t.processFilters(backendFilters, parentRef, route, resources)
 		destFilters = assignDestinationFilters(httpFiltersContext)
-
 	}
 
 	ds = &ir.DestinationSetting{

diff --git a/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-ca-only.out.yaml
@@ -145,7 +145,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/envoy-gateway/httproute-btls/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-default-ns.out.yaml
@@ -144,7 +144,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/envoy-gateway/httproute-btls/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-invalid-ca.out.yaml
@@ -145,7 +145,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/envoy-gateway/httproute-btls/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-system-truststore.out.yaml
@@ -141,7 +141,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/envoy-gateway/httproute-btls/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.out.yaml b/internal/gatewayapi/testdata/backendtlspolicy-without-referencegrant.out.yaml
@@ -146,7 +146,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/envoy-gateway/httproute-btls/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-override-replace.out.yaml
@@ -222,7 +222,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:
@@ -245,7 +245,7 @@ xdsIR:
           prefix: /foo
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-2/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-fault-injection.out.yaml
@@ -344,7 +344,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: grpcroute/default/grpcroute-1/rule/0
           settings:
@@ -382,7 +382,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-2/rule/0
           settings:
@@ -406,7 +406,7 @@ xdsIR:
           prefix: /route2
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-use-client-protocol.out.yaml
@@ -140,14 +140,15 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:
           - addressType: IP
             endpoints:
             - host: 7.7.7.7
               port: 8080
+            filters: {}
             protocol: HTTP
             weight: 1
         hostname: gateway.envoyproxy.io

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers-error.out.yaml
@@ -326,7 +326,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: grpcroute/default/grpcroute-1/rule/0
           settings:
@@ -357,7 +357,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-2/rule/0
           settings:
@@ -377,7 +377,7 @@ xdsIR:
           prefix: /foo
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-circuitbreakers.out.yaml
@@ -267,7 +267,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         circuitBreaker:
           maxConnections: 2048
           maxParallelRequests: 4294967295
@@ -304,7 +304,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         circuitBreaker:
           maxConnections: 42
           maxParallelRequests: 42

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-healthcheck.out.yaml
@@ -477,7 +477,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: grpcroute/default/grpcroute-1/rule/0
           settings:
@@ -531,7 +531,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-2/rule/0
           settings:
@@ -570,7 +570,7 @@ xdsIR:
           prefix: /v2
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-3/rule/0
           settings:
@@ -609,7 +609,7 @@ xdsIR:
           prefix: /v3
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml
@@ -366,7 +366,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: grpcroute/default/grpcroute-1/rule/0
           settings:
@@ -399,7 +399,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-2/rule/0
           settings:
@@ -423,7 +423,7 @@ xdsIR:
           prefix: /test2
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/...api/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml b/...api/testdata/backendtrafficpolicy-with-local-ratelimit-default-route-level-limit.out.yaml
@@ -163,7 +163,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/...gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml b/...gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-limit-unit.out.yaml
@@ -167,7 +167,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/...gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.out.yaml b/...gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit-invalid-match-type.out.yaml
@@ -163,7 +163,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/...ta/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml b/...ta/backendtrafficpolicy-with-local-ratelimit-invalid-multiple-route-level-limits.out.yaml
@@ -170,7 +170,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-local-ratelimit.out.yaml
@@ -166,7 +166,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-proxyprotocol.out.yaml
@@ -259,7 +259,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: grpcroute/default/grpcroute-1/rule/0
           settings:
@@ -292,7 +292,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit-invalid-regex.out.yaml
@@ -149,7 +149,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: grpcroute/default/grpcroute-1/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml
@@ -279,7 +279,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: grpcroute/default/grpcroute-1/rule/0
           settings:
@@ -322,7 +322,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-retries.out.yaml
@@ -278,7 +278,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: grpcroute/default/grpcroute-1/rule/0
           settings:
@@ -318,7 +318,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-same-prefix-httproutes.out.yaml
@@ -182,7 +182,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         circuitBreaker:
           maxConnections: 2048
           maxParallelRequests: 4294967295
@@ -206,7 +206,7 @@ xdsIR:
           prefix: /
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1-1/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-tcpkeepalive.out.yaml
@@ -263,7 +263,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: grpcroute/default/grpcroute-1/rule/0
           settings:
@@ -298,7 +298,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: httproute/default/httproute-1/rule/0
           settings:

diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-timeout-error.out.yaml
@@ -140,7 +140,7 @@ xdsIR:
       routes:
       - backendWeights:
           invalid: 0
-          valid: 0
+          valid: 1
         destination:
           name: grpcroute/default/grpcroute-1/rule/0
           settings: