Fixes BackendRefs Status Condition

Signed-off-by: danehans <daneyonhansen@gmail.com>
envoyproxy · Oct 8, 2022 · 600f8fc · 600f8fc
1 parent 5bf755d
commit 600f8fc
Show file tree

Hide file tree

Showing 36 changed files with 177 additions and 4 deletions.
diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-allowed-httproute.out.yaml
@@ -53,6 +53,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service envoy-gateway/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/...ata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml b/...ata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml
@@ -58,6 +58,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-tls-configuration.out.yaml
@@ -57,6 +57,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/.../testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml b/.../testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml
@@ -73,6 +73,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners.out.yaml
@@ -71,6 +71,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:
@@ -112,7 +116,7 @@ infraIR:
       listeners:
         - address: ""
           ports:
-            - name: http-1
+            - name: http-2
               protocol: "HTTP"
               servicePort: 80
               containerPort: 10080
diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml
@@ -53,6 +53,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/...atewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml b/...atewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml
@@ -73,6 +73,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml
@@ -55,6 +55,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-no-weights.out.yaml
@@ -57,6 +57,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-3 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml b/internal/gatewayapi/testdata/httproute-rule-with-multiple-backends-and-weights.out.yaml
@@ -60,6 +60,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-3 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/...wayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml b/...wayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml
@@ -55,6 +55,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service backends/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/.../gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml b/.../gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml
@@ -73,6 +73,10 @@ httpRoutes:
         status: "True"
         reason: UnsupportedValue
         message: "RequestHeaderModifier Filter already configures request header: add-header-1 to be added, ignoring second entry"
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml
@@ -84,6 +84,10 @@ httpRoutes:
         reason: UnsupportedValue
         # Currently only one invalid value status will be set. If there are multiple, then only the latest is displayed until that issue is resolved.
         message: "RequestHeaderModifier Filter already configures request header: set-header-4 to be added/set, ignoring second entry"
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/...tewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml b/...tewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml
@@ -69,6 +69,10 @@ httpRoutes:
         status: "True"
         reason: UnsupportedValue
         message: "RequestHeaderModifier Filter already configures request header: rem-header-1 to be removed, ignoring second entry"
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml
@@ -64,6 +64,10 @@ httpRoutes:
         status: "True"
         reason: UnsupportedValue
         message: "RequestHeaderModifier Filter already configures request header: some-header-1 to be removed, ignoring second entry"
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.out.yaml
@@ -67,6 +67,10 @@ httpRoutes:
         status: "True"
         reason: Accepted
         message: Route is accepted
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml
@@ -69,6 +69,10 @@ httpRoutes:
         status: "False"
         reason: UnsupportedValue
         message: "RequestHeaderModifier Filter cannot set a header with an empty name"
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml
@@ -69,6 +69,10 @@ httpRoutes:
         status: "False"
         reason: UnsupportedValue
         message: "RequestHeaderModifier Filter cannot set headers with a '/' or ':' character in them. Header: 'example:1'"
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml
@@ -64,6 +64,10 @@ httpRoutes:
         status: "True"
         reason: Accepted
         message: Route is accepted
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-no-valid-headers.out.yaml
@@ -64,6 +64,10 @@ httpRoutes:
         status: "False"
         reason: UnsupportedValue
         message: "RequestHeaderModifier Filter did not provide valid configuration to add/set/remove any headers"
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml
@@ -65,6 +65,10 @@ httpRoutes:
         status: "True"
         reason: Accepted
         message: Route is accepted
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/...-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml b/...-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml
@@ -56,6 +56,10 @@ httpRoutes:
         status: "False"
         reason: NoMatchingListenerHostname
         message: There were no hostname intersections between the HTTPRoute and this parent ref's Listener(s).
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-full-path-replace-https.out.yaml
@@ -66,6 +66,10 @@ httpRoutes:
         status: "True"
         reason: Accepted
         message: Route is accepted
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml
@@ -64,6 +64,10 @@ httpRoutes:
         status: "True"
         reason: Accepted
         message: Route is accepted
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-filter-type.out.yaml
@@ -63,6 +63,10 @@ httpRoutes:
         status: "False"
         reason: UnsupportedValue
         message: "Unknown custom filter type: UnsupportedType"
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml
@@ -63,6 +63,10 @@ httpRoutes:
         status: "False"
         reason: UnsupportedValue
         message: "Scheme: unknown is unsupported, only 'https' and 'http' are supported"
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml
@@ -63,6 +63,10 @@ httpRoutes:
         status: "False"
         reason: UnsupportedValue
         message: "Status code 666 is invalid, only 302 and 301 are supported"
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/...gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml b/...gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml
@@ -67,6 +67,10 @@ httpRoutes:
         status: "True"
         reason: Accepted
         message: Route is accepted
+      - type: ResolvedRefs
+        status: "True"
+        reason: ResolvedRefs
+        message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-exact-path-match.out.yaml
@@ -54,6 +54,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/...pi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml b/...pi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml
@@ -58,6 +58,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml b/internal/gatewayapi/testdata/httproute-with-some-invalid-backend-refs-no-service.out.yaml
@@ -61,7 +61,7 @@ httpRoutes:
       - type: ResolvedRefs
         status: "False"
         reason: BackendNotFound
-        message: "Service default/service-that-doesnt-exist-2 not found"
+        message: "Service default/service-that-doesnt-exist not found, Service default/service-that-doesnt-exist-2 not found"
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/...ata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml b/...ata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml
@@ -56,6 +56,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http:

diff --git a/...ttproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml b/...ttproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml
@@ -57,6 +57,10 @@ httpRoutes:
               status: "True"
               reason: Accepted
               message: Route is accepted
+            - type: ResolvedRefs
+              status: "True"
+              reason: ResolvedRefs
+              message: Service default/service-1 found
 xdsIR:
   envoy-gateway-gateway-1:
     http: