diff --git a/charts/gateway-helm/crds/gatewayapi-crds.yaml b/charts/gateway-helm/crds/gatewayapi-crds.yaml index a9b5b4c77ac..fa7d880dad8 100644 --- a/charts/gateway-helm/crds/gatewayapi-crds.yaml +++ b/charts/gateway-helm/crds/gatewayapi-crds.yaml @@ -24,7 +24,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 - gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 + gateway.networking.k8s.io/bundle-version: v1.0.0-rc2 gateway.networking.k8s.io/channel: experimental creationTimestamp: null labels: @@ -199,12 +199,12 @@ spec: - hostname type: object x-kubernetes-validations: - - message: must not contain both CertRefs and WellKnownCACerts - rule: (has(self.caCertRefs) && size(self.caCertRefs) > 0 && has(self.wellKnownCACerts) - && self.wellKnownCACerts != "") - - message: must specify either CertRefs or WellKnownCACerts - rule: '!(has(self.caCertRefs) && size(self.caCertRefs) > 0 || has(self.wellKnownCACerts) + - message: must not contain both CACertRefs and WellKnownCACerts + rule: '!(has(self.caCertRefs) && size(self.caCertRefs) > 0 && has(self.wellKnownCACerts) && self.wellKnownCACerts != "")' + - message: must specify either CACertRefs or WellKnownCACerts + rule: (has(self.caCertRefs) && size(self.caCertRefs) > 0 || has(self.wellKnownCACerts) + && self.wellKnownCACerts != "") required: - targetRef - tls @@ -509,7 +509,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 - gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 + gateway.networking.k8s.io/bundle-version: v1.0.0-rc2 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: gatewayclasses.gateway.networking.k8s.io @@ -1009,7 +1009,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 - gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 + gateway.networking.k8s.io/bundle-version: v1.0.0-rc2 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: gateways.gateway.networking.k8s.io @@ -2817,7 +2817,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 - gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 + gateway.networking.k8s.io/bundle-version: v1.0.0-rc2 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: grpcroutes.gateway.networking.k8s.io @@ -4547,7 +4547,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 - gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 + gateway.networking.k8s.io/bundle-version: v1.0.0-rc2 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: httproutes.gateway.networking.k8s.io @@ -9509,7 +9509,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 - gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 + gateway.networking.k8s.io/bundle-version: v1.0.0-rc2 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: referencegrants.gateway.networking.k8s.io @@ -9798,7 +9798,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 - gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 + gateway.networking.k8s.io/bundle-version: v1.0.0-rc2 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: tcproutes.gateway.networking.k8s.io @@ -10439,7 +10439,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 - gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 + gateway.networking.k8s.io/bundle-version: v1.0.0-rc2 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: tlsroutes.gateway.networking.k8s.io @@ -11129,7 +11129,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 - gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 + gateway.networking.k8s.io/bundle-version: v1.0.0-rc2 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: udproutes.gateway.networking.k8s.io diff --git a/go.mod b/go.mod index 168664d61ca..f75200ffe34 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( k8s.io/kubectl v0.28.3 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 sigs.k8s.io/controller-runtime v0.16.3 - sigs.k8s.io/gateway-api v1.0.0-rc1 + sigs.k8s.io/gateway-api v1.0.0-rc2 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index 33cd1b9f653..601027d0fe0 100644 --- a/go.sum +++ b/go.sum @@ -737,8 +737,8 @@ sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gE sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4= sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= -sigs.k8s.io/gateway-api v1.0.0-rc1 h1:v7N9fWTcQxox5aP2IrViDw6imeUHMAt2WFjI4BYo0sw= -sigs.k8s.io/gateway-api v1.0.0-rc1/go.mod h1:+QpYENjk9s31/abu2Pv5BpK2v88UQDK2aeQCwCvy6ck= +sigs.k8s.io/gateway-api v1.0.0-rc2 h1:+7rq7j5fehUkMkgnJyL90mtXrVnz8aj5SXsRqIEW3Mk= +sigs.k8s.io/gateway-api v1.0.0-rc2/go.mod h1:+QpYENjk9s31/abu2Pv5BpK2v88UQDK2aeQCwCvy6ck= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kind v0.8.1/go.mod h1:oNKTxUVPYkV9lWzY6CVMNluVq8cBsyq+UgPJdvA3uu4= diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml index 5a5a7e8f2f3..bfc39f0543d 100644 --- a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml @@ -152,7 +152,6 @@ gateways: namespace: default spec: gatewayClassName: eg - infrastructure: {} listeners: - name: tcp port: 1234 diff --git a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml index 38df47de2bb..c61a2fdf774 100644 --- a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml +++ b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml @@ -19,7 +19,6 @@ gateways: namespace: envoy-gateway-system spec: gatewayClassName: eg - infrastructure: {} listeners: - name: http port: 80 diff --git a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.route.json b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.route.json index e68ceb2be3d..41dfd6683e7 100644 --- a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.route.json +++ b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.route.json @@ -35,8 +35,7 @@ "port": 80, "protocol": "HTTP" } - ], - "infrastructure": {} + ] }, "status": { "listeners": [ diff --git a/internal/cmd/egctl/testdata/translate/out/invalid-envoyproxy.all.yaml b/internal/cmd/egctl/testdata/translate/out/invalid-envoyproxy.all.yaml index cbb15ee7d7f..c7ad9cde133 100644 --- a/internal/cmd/egctl/testdata/translate/out/invalid-envoyproxy.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/invalid-envoyproxy.all.yaml @@ -45,7 +45,6 @@ gateways: namespace: default spec: gatewayClassName: eg - infrastructure: {} listeners: - name: tcp port: 1234 diff --git a/internal/cmd/egctl/testdata/translate/out/rejected-http-route.route.yaml b/internal/cmd/egctl/testdata/translate/out/rejected-http-route.route.yaml index c648c138552..1cf2dc126c2 100644 --- a/internal/cmd/egctl/testdata/translate/out/rejected-http-route.route.yaml +++ b/internal/cmd/egctl/testdata/translate/out/rejected-http-route.route.yaml @@ -19,7 +19,6 @@ gateways: namespace: envoy-gateway-system spec: gatewayClassName: eg - infrastructure: {} listeners: - name: tls port: 8443 diff --git a/internal/cmd/egctl/testdata/translate/out/valid-envoyproxy.all.yaml b/internal/cmd/egctl/testdata/translate/out/valid-envoyproxy.all.yaml index 240c41716ee..ef42d68c93e 100644 --- a/internal/cmd/egctl/testdata/translate/out/valid-envoyproxy.all.yaml +++ b/internal/cmd/egctl/testdata/translate/out/valid-envoyproxy.all.yaml @@ -38,7 +38,6 @@ gateways: namespace: default spec: gatewayClassName: eg - infrastructure: {} listeners: - name: tcp port: 1234 diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml index b2d814f29da..d8fe370ea6a 100644 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-status-conditions.out.yaml @@ -105,7 +105,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: @@ -146,7 +145,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml index b2572c9d2ff..a8c1817427c 100755 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-loadbalancer.out.yaml @@ -52,7 +52,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: @@ -93,7 +92,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml index 08b19666e18..1903b43a593 100755 --- a/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/backendtrafficpolicy-with-ratelimit.out.yaml @@ -70,7 +70,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: @@ -111,7 +110,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml index 35f7854be4a..413b622c743 100644 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-status-conditions.out.yaml @@ -133,7 +133,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: @@ -174,7 +173,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml index 4992c59db30..df173dba7d5 100755 --- a/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml +++ b/internal/gatewayapi/testdata/clienttrafficpolicy-tcp-keepalive.out.yaml @@ -58,7 +58,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/disable-accesslog.out.yaml b/internal/gatewayapi/testdata/disable-accesslog.out.yaml index e6b4703f44e..39e8d26d571 100644 --- a/internal/gatewayapi/testdata/disable-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/disable-accesslog.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml index 40698426f23..f7293e04c96 100755 --- a/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-cross-ns-target.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml index 6c03d80394d..b5d451c716b 100755 --- a/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-invalid-target-kind.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml index 287c1fbc877..5c75624e136 100644 --- a/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoypatchpolicy-valid.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml index 657b1451b21..d7032df5b1a 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json-no-format.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml index a750c777996..4e3a60ba8f3 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-file-json.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml index 72cd526e481..b4611b897da 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog-with-bad-sinks.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml index 9c8a1ceb90c..01428c425e2 100644 --- a/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-accesslog.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml index ea18760f8c5..9157ee69062 100644 --- a/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml +++ b/internal/gatewayapi/testdata/envoyproxy-valid.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml index 3fe257c755d..2828bf08166 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-extension-filter-invalid-group.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml index 2da4c8304a6..d9271e30fc9 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-non-matching-extension-filter.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml index cef3b8f54cd..5f8e8829df6 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-unsupported-extension-filter.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml index 2740a77d6e1..d01e792dd71 100644 --- a/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml +++ b/internal/gatewayapi/testdata/extensions/httproute-with-valid-extension-filter.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index 46b95ef1dc5..25c3cce6796 100644 --- 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 @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml index 020b58c9394..0c17d8dd89f 100644 --- a/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-allows-same-namespace-with-disallowed-httproute.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml index a9fbc94d078..160fdae760e 100644 --- a/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-addresses-with-ipaddress.out.yaml @@ -14,7 +14,6 @@ gateways: - type: Hostname value: foo.bar gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - name: tcp port: 80 diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml index 50dad411b1d..d360fbafe44 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-namespaces-selector.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml index 6abba3b9e6a..1bd59a4c7c2 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-group.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: kinds: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml index 96d38561b39..03568e1828b 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind-and-supported.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: kinds: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml index 6caec557c57..0854ce26a7d 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-routes-kind.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: kinds: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml index 15bb8bee7f7..d6a010af299 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-allowed-tls-route-kind.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: kinds: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml index 820dd86f154..7217e4191af 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml index dc82ae4e6ed..7db3c46cef1 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-invalid-mode.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml index 3e30315251d..654ea7d841e 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-certificate-refs.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.out.yaml index 2e23126a0da..deb3363ef43 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-no-valid-certificate-for-fqdn.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml index a845904bf7a..b7e09ffc5e6 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-does-not-exist.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml index c04fdf566cb..ac0bea42b99 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-in-other-namespace.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml index 1d2f8c04b9a..3e8ca57f335 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-tls-configuration-secret-is-not-valid.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml index 413b2d186a4..9e7040d42cf 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-missing-allowed-namespaces-selector.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml index 3328108c61f..d6d72c55452 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcp-with-hostname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml index 809227c0e68..76f634d295a 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml index fcc6e1bff42..5ca44bf64d0 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml index b8f8202376b..b24190c9e08 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-rules.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml index e8be45361a1..851bdc81538 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-secret-in-other-namespace-allowed-by-refgrant.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml index 6d06c36b059..125a1519bac 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-tls-terminate-and-passthrough.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml index 454b380a764..cdec1d56490 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udp-with-hostname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml index 372440a3edb..518de1b91fa 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-mismatch-port-protocol.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml index 44f06ff7f7c..f52d4f1a720 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-backends.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml index 05b4baa8679..c024a1cfa91 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-udproute-with-multiple-rules.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml index abd3001c234..16f687f3ce2 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-tcproute.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml index 36e6e97bb62..f5d768207dc 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unmatched-udproute.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml index 9bfeba5b671..7e24746ae1d 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-unsupported-protocol.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml index d287787995c..806ed34a6b6 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration-with-same-algorithm-different-fqdn.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml index d0ca9520da6..07a1de64cb4 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-valid-multiple-tls-configuration.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index ecd508afdad..337937ea290 100644 --- 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 @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml index 306cf9ad7e2..7f3e382bf42 100644 --- a/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-preexisting-status-condition.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: default spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml index 8cc2b4e5693..a88038eae96 100644 --- a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml index 93d06eb40ac..754dae0c4dc 100644 --- a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-udproutes.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml index 8f39c0e8cdb..cc331a9ec1d 100644 --- a/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-stale-status-condition.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: default spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml index e17e582fb09..9f6f8957295 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml index 7b45e9376f8..4b312da21d8 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-udp-port.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml index c035a81d0cc..dda0a7c4e74 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-http-and-tlsroute-same-hostname-and-port.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml index 2300fb9a87b..d7f5bbc33e2 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-multiple-httproutes.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml index fcc190ce29f..c7db7a21465 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-hostname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml index 301e903cd03..7ec1823a77e 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-and-incompatible-protocol.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml index e23ea10a721..da39c8b00ef 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml index 8b51c3207f0..d59e161199d 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-udp-protocol.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml index 06209327595..49acc6c8452 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml index 695d0baabaf..759e45901db 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml index 43289b482c3..a5a304ba208 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-with-sectionname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml index 50c800f29b7..692388c6498 100644 --- a/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml +++ b/internal/gatewayapi/testdata/gateway-with-two-listeners-with-udproutes-without-sectionname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml index 60848b1ba37..59d139d01c1 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml index fea45992816..ee66e91bc17 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-and-service-match.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml index 0b0f620ed9a..b7fc079c14f 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-method-match.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml index 5276b87e974..1891581612e 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml index b596ec87f4f..4406f205c53 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-service-match.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/grpcroute-with-valid-authenfilter.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-valid-authenfilter.out.yaml index 6ab20d3b833..b36321651d8 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-valid-authenfilter.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-valid-authenfilter.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/grpcroute-with-valid-ratelimitfilter.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-valid-ratelimitfilter.out.yaml index 089abc5f511..704f48edb10 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-valid-ratelimitfilter.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-valid-ratelimitfilter.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml index 9fea76f8b9d..d30026097ab 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-different-listeners.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml index 5f0440b0509..de694b38c8c 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-more-listeners.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml index efea583f79f..737d43da668 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway-with-two-listeners-with-different-ports.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index 7254ead6df3..e88edaa93ac 100644 --- 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 @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml index f4a338833f1..ae14d6cbe63 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-gateway.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml index 962c6b444ed..a8d9a02048b 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-matching-port.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml index 02af912183a..dddac198b29 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-on-gateway-with-two-listeners.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml index 6be302ae3be..f5334296b70 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener-with-serviceimport-backendref.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml index 8b231b5d8c5..aae08dee870 100644 --- a/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml +++ b/internal/gatewayapi/testdata/httproute-attaching-to-listener.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml index e3a8c390ed9..d910e6e5442 100755 --- a/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-backend-request-timeout.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml b/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml index 0942b6d5c55..4cd3e58a774 100644 --- a/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-not-attaching-to-listener-non-matching-port.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml index f8e11085e17..8e55e85f2be 100644 --- a/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml +++ b/internal/gatewayapi/testdata/httproute-request-timeout.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index 8b3d562fb2c..d7fc6c8c81c 100644 --- 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 @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index 4b3386d9621..06e52bfe474 100644 --- 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 @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml index 625f31d66b8..c9c5a58e59d 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml index 6c945d476c3..20ed4f04dbb 100644 --- a/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-backendref-serviceimport-in-other-namespace-allowed-by-refgrant.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-distinct-sourcecidr-ratelimit.out.yaml b/internal/gatewayapi/testdata/httproute-with-distinct-sourcecidr-ratelimit.out.yaml index a24337c4344..556411900c9 100644 --- a/internal/gatewayapi/testdata/httproute-with-distinct-sourcecidr-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-distinct-sourcecidr-ratelimit.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml index 647a2dcfce6..14f190acbc5 100644 --- a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml index c1ef644142a..b186106f0ce 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-add-multiple-filters.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index 32f5edb81ea..55a7d36259c 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml index f139d38aeb4..7f12824c553 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-remove-multiple-filters.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index 77961efa602..a466c593e7a 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-removes.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index dfeb4ae43a6..2e4b11c24cb 100644 --- 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 @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index 4c8847939ae..9d79d3a3475 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index fd728476770..14cb1d167ef 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index 1f45ffb56d1..d2d65c9dd62 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-no-headers.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index d9486910bdd..b32d9c0a122 100644 --- 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 @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml index 5fa48373716..2ae92bdd504 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml index 84f0bd4795c..e75b60882e6 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-bad-port.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml index c2ff9d80d92..50079248c8a 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-group.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml index 45778ad58dc..6781dcc65b7 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-invalid-kind.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml index 9d22f8bdd54..020a7bf3f96 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-port.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml index 88225cc401b..669c5afcdab 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.import.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml index 1df5cf57893..9e4963f1127 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backend-ref-no-service.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml index f215dd37295..9543bab4beb 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-backendref-in-other-namespace.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml index 91d56a2d684..4328150736a 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml index b5438807e70..afa9f1c4524 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-duplicates.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml index 2a10c73d292..d5aa80f0bd1 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-multiple.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml index 9355ecbd66c..85b30ec48e6 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-no-port.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml index d30cec69111..2858e31d5aa 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter-service-not-found.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml index f226a8241eb..6d64d583a12 100644 --- a/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-mirror-filter.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-non-existent-authenfilter-ref.out.yaml b/internal/gatewayapi/testdata/httproute-with-non-existent-authenfilter-ref.out.yaml index bcaa367f29b..919f22bf257 100644 --- a/internal/gatewayapi/testdata/httproute-with-non-existent-authenfilter-ref.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-non-existent-authenfilter-ref.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-non-matching-authenfilter-ref.out.yaml b/internal/gatewayapi/testdata/httproute-with-non-matching-authenfilter-ref.out.yaml index 60b40b58422..b61269b4370 100644 --- a/internal/gatewayapi/testdata/httproute-with-non-matching-authenfilter-ref.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-non-matching-authenfilter-ref.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml index 6d5a7ea8e28..14f9cf7dacc 100644 --- a/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-non-matching-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index 794fa4179e7..3b0c94febaa 100644 --- 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 @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml index b1fd7b9e7e3..effccbc5fa3 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index e2e09970442..b551b071c98 100644 --- 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 @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index 73b8cb1ee71..ce331c461d9 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-scheme.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index 08c4901391d..08792fc2676 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-invalid-status.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml index b9d67b1f963..e87602dc49c 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-prefix-replace-with-port-http.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml index 460a090bad7..d376bb2bd31 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml index 94ee5ccd4fe..082da467faa 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-add-multiple-filters.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml index a918aa754f0..7387da265c8 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml index 2da623c330b..5050624b40e 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-remove-multiple-filters.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml index d176af428e2..a6d34ce0944 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-removes.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml index 3a2f62992b2..dce73fb7d96 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml index 0d4fd6a69aa..1635b111757 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml index a838b5eda56..77ff80ec20d 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml index e67daf81dc1..80d939f8009 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-headers.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml index 46d342b520e..e18af4f074e 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-no-valid-headers.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml index ac5255a93cb..e1d73c90422 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-remove.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index b6b8e5b79d1..3de870613b9 100644 --- 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 @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml index dc6b524a0cd..fdb845ae1d0 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml index 01057b6b90d..33d4418d46a 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-multiple-rules.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml index ca2e9ac16e0..4bb51c36abf 100644 --- a/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-path-prefix-and-exact-header-matches.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: 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 index 0e8849a70ba..cd095768ea3 100644 --- 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 @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-sourcecidr-ratelimit.out.yaml b/internal/gatewayapi/testdata/httproute-with-sourcecidr-ratelimit.out.yaml index 931581c525c..3f80798c10a 100644 --- a/internal/gatewayapi/testdata/httproute-with-sourcecidr-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-sourcecidr-ratelimit.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml index 8526127403a..8654dbf94b4 100644 --- a/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-specific-hostname-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml index 556e13be93b..f89e3718881 100644 --- a/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-two-specific-hostnames-attaching-to-gateway-with-wildcard-hostname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml index a2eda476beb..a216ec0d08e 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-full-path-replace-http.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml index 46ea2499449..1758895c365 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname-prefix-replace.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml index 2f5af2b92b0..c89bf6ad9e6 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-hostname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml index 0b5e57539b7..8b3354f1a3b 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-filter-type.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml index 34e78146414..4368e3326aa 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-hostname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml index fea06ada60e..4860707ed5a 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-multiple-filters.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml index 2f37b63f236..3ac9cd2e136 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path-type.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml index b59fd6d7322..69dfe210917 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-invalid-path.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml index 9f485f391d2..df69cdec644 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-missing-path.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml index 43b5e67e5df..a77717cbd76 100644 --- a/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-urlrewrite-filter-prefix-replace-http.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-valid-authenfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-valid-authenfilter.out.yaml index a19010ed3f3..ef2b7de94f8 100644 --- a/internal/gatewayapi/testdata/httproute-with-valid-authenfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-valid-authenfilter.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-valid-multi-match-authenfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-valid-multi-match-authenfilter.out.yaml index 58923d12e88..e88afb72488 100644 --- a/internal/gatewayapi/testdata/httproute-with-valid-multi-match-authenfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-valid-multi-match-authenfilter.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-valid-multi-match-multi-authenfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-valid-multi-match-multi-authenfilter.out.yaml index a0d9935435c..9cc518431ef 100644 --- a/internal/gatewayapi/testdata/httproute-with-valid-multi-match-multi-authenfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-valid-multi-match-multi-authenfilter.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml index cab1542d000..b278efea178 100644 --- a/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-valid-ratelimitfilter.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml b/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml index 210720c614b..6f9a6e0f893 100644 --- a/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-wildcard-hostname-attaching-to-gateway-with-unset-hostname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml index f31c3dc2175..83b255739cf 100644 --- a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml b/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml index fa4b57bcb56..46f9e3d125b 100755 --- a/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml +++ b/internal/gatewayapi/testdata/merge-invalid-multiple-gateways.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - name: http port: 80 @@ -45,7 +44,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - name: http port: 80 diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml index 720f7ec14a1..1f91380625f 100755 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways-multiple-routes.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: @@ -49,7 +48,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - name: http-2 port: 8888 diff --git a/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml b/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml index 76639b23b93..8a1c6976844 100755 --- a/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml +++ b/internal/gatewayapi/testdata/merge-valid-multiple-gateways.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: @@ -48,7 +47,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml b/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml index d4c17232a74..4a2610a0084 100755 --- a/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-status-conditions.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: @@ -48,7 +47,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml index 89485439e63..0a2b0cbb239 100755 --- a/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml +++ b/internal/gatewayapi/testdata/securitypolicy-with-cors.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: @@ -48,7 +47,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml b/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml index 902ab4632a8..20df52b004f 100644 --- a/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml +++ b/internal/gatewayapi/testdata/tcproute-attaching-to-gateway-with-listener-tls-terminate.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml index 87bb5ae9b85..8e45df442d5 100644 --- a/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-attaching-to-gateway.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml index 9a181fd3136..77b25d4495f 100644 --- a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml b/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml index c489c472f94..2fac08a9c5e 100644 --- a/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-not-attaching-to-gateway-with-no-mode.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml index 9db730684d2..4264efe0bef 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-backendref-in-other-namespace-allowed-by-refgrant.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml index 01155ee7392..cb9f727850e 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-hostname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml index cdea4a34046..414c6b8e574 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-empty-listener-hostname.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml b/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml index b8606275d5e..0e48f934a10 100644 --- a/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-with-listener-both-passthrough-and-cert-data.out.yaml @@ -7,7 +7,6 @@ gateways: namespace: envoy-gateway spec: gatewayClassName: envoy-gateway-class - infrastructure: {} listeners: - allowedRoutes: namespaces: diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go index 6bfa06fe39b..ad81e21cd26 100644 --- a/test/conformance/conformance_test.go +++ b/test/conformance/conformance_test.go @@ -51,6 +51,8 @@ func TestGatewayAPIConformance(t *testing.T) { tests.GatewaySecretInvalidReferenceGrant.ShortName, tests.HTTPRouteRewritePath.ShortName, tests.GatewayStaticAddresses.ShortName, + tests.GatewayWithAttachedRoutes.ShortName, + tests.HTTPRouteBackendProtocolH2C.ShortName, }, ExemptFeatures: suite.MeshCoreFeatures, }) diff --git a/test/conformance/experimental_conformance_test.go b/test/conformance/experimental_conformance_test.go index 9276d290ebe..5415f150ca7 100644 --- a/test/conformance/experimental_conformance_test.go +++ b/test/conformance/experimental_conformance_test.go @@ -99,6 +99,8 @@ func experimentalConformance(t *testing.T) { tests.GatewaySecretInvalidReferenceGrant.ShortName, tests.HTTPRouteRewritePath.ShortName, tests.GatewayStaticAddresses.ShortName, + tests.GatewayWithAttachedRoutes.ShortName, + tests.HTTPRouteBackendProtocolH2C.ShortName, }, SupportedFeatures: sets.Set[suite.SupportedFeature]{}.Insert(suite.HTTPRouteExtendedFeatures.UnsortedList()...), },