From 278e02fe486760c4f77bef5413a750fc890a34bf Mon Sep 17 00:00:00 2001 From: tmsnan Date: Tue, 27 Jun 2023 08:50:19 +0800 Subject: [PATCH] linter: Check for trailing spaces at the end of lines in yaml (#1595) Signed-off-by: zhaonan --- .github/workflows/build_and_test.yaml | 10 +++++----- .github/workflows/docs.yaml | 2 +- .github/workflows/latest_release.yaml | 6 +++--- .github/workflows/release.yaml | 2 +- .github/workflows/retest.yaml | 4 ++-- examples/kubernetes/grpc-routing.yaml | 6 +++--- examples/loki/loki.yaml | 2 +- examples/otel-collector/helm-values.yaml | 2 +- .../egctl/testdata/translate/in/default-resources.yaml | 2 +- .../testdata/translate/in/invalid-envoyproxy.yaml | 4 ++-- .../egctl/testdata/translate/in/valid-envoyproxy.yaml | 6 +++--- ...proute-with-extension-filter-invalid-group.out.yaml | 4 ++-- ...tproute-with-non-matching-extension-filter.out.yaml | 4 ++-- ...ttproute-with-unsupported-extension-filter.out.yaml | 4 ++-- .../httproute-with-valid-extension-filter.out.yaml | 2 +- ...s-same-namespace-with-disallowed-httproute.out.yaml | 6 +++--- ...ner-with-invalid-multiple-tls-configuration.in.yaml | 2 +- ...h-http-and-tlsroute-same-hostname-and-port.out.yaml | 10 +++++----- ...ith-two-listeners-with-multiple-httproutes.out.yaml | 4 ++-- ...-two-listeners-with-same-port-and-hostname.out.yaml | 8 ++++---- ...listeners-with-same-port-http-udp-protocol.out.yaml | 2 +- .../testdata/grpcroute-with-header-match.in.yaml | 6 +++--- .../testdata/grpcroute-with-header-match.out.yaml | 8 ++++---- .../grpcroute-with-request-header-modifier.in.yaml | 6 +++--- .../grpcroute-with-request-header-modifier.out.yaml | 8 ++++---- .../testdata/httproute-with-empty-matches.out.yaml | 2 +- ...ader-filter-duplicate-add-multiple-filters.out.yaml | 2 +- ...httproute-with-header-filter-duplicate-adds.in.yaml | 2 +- ...ttproute-with-header-filter-duplicate-adds.out.yaml | 4 ++-- ...r-filter-duplicate-remove-multiple-filters.out.yaml | 2 +- ...route-with-header-filter-duplicate-removes.out.yaml | 2 +- ...oute-with-header-filter-empty-header-values.in.yaml | 2 +- ...ute-with-header-filter-empty-header-values.out.yaml | 4 ++-- .../httproute-with-header-filter-empty-headers.in.yaml | 2 +- ...httproute-with-header-filter-empty-headers.out.yaml | 6 +++--- ...ttproute-with-header-filter-invalid-headers.in.yaml | 2 +- ...tproute-with-header-filter-invalid-headers.out.yaml | 6 +++--- .../httproute-with-header-filter-no-headers.out.yaml | 2 +- ...proute-with-header-filter-no-valid-headers.out.yaml | 4 ++-- .../httproute-with-header-filter-remove.out.yaml | 2 +- ...ttproute-with-invalid-backend-ref-bad-port.out.yaml | 4 ++-- ...ute-with-invalid-backend-ref-invalid-group.out.yaml | 4 ++-- ...oute-with-invalid-backend-ref-invalid-kind.out.yaml | 4 ++-- ...httproute-with-invalid-backend-ref-no-port.out.yaml | 4 ++-- ...proute-with-invalid-backend-ref-no-service.out.yaml | 4 ++-- .../httproute-with-invalid-ratelimitfilter.out.yaml | 4 ++-- ...ttproute-with-non-existent-authenfilter-ref.in.yaml | 2 +- ...tproute-with-non-existent-authenfilter-ref.out.yaml | 4 ++-- ...ttproute-with-non-matching-authenfilter-ref.in.yaml | 2 +- ...tproute-with-non-matching-authenfilter-ref.out.yaml | 4 ++-- ...ttaching-to-gateway-with-wildcard-hostname.out.yaml | 2 +- ...th-redirect-filter-full-path-replace-https.out.yaml | 2 +- .../httproute-with-redirect-filter-hostname.out.yaml | 2 +- ...e-with-redirect-filter-invalid-filter-type.out.yaml | 4 ++-- ...proute-with-redirect-filter-invalid-scheme.out.yaml | 4 ++-- ...proute-with-redirect-filter-invalid-status.out.yaml | 4 ++-- ...irect-filter-prefix-replace-with-port-http.out.yaml | 2 +- .../httproute-with-response-header-filter-adds.in.yaml | 2 +- ...httproute-with-response-header-filter-adds.out.yaml | 4 ++-- ...ader-filter-duplicate-add-multiple-filters.out.yaml | 2 +- ...-with-response-header-filter-duplicate-adds.in.yaml | 2 +- ...with-response-header-filter-duplicate-adds.out.yaml | 4 ++-- ...r-filter-duplicate-remove-multiple-filters.out.yaml | 2 +- ...h-response-header-filter-duplicate-removes.out.yaml | 2 +- ...-response-header-filter-empty-header-values.in.yaml | 2 +- ...response-header-filter-empty-header-values.out.yaml | 4 ++-- ...e-with-response-header-filter-empty-headers.in.yaml | 2 +- ...-with-response-header-filter-empty-headers.out.yaml | 6 +++--- ...with-response-header-filter-invalid-headers.in.yaml | 2 +- ...ith-response-header-filter-invalid-headers.out.yaml | 6 +++--- ...ute-with-response-header-filter-no-headers.out.yaml | 2 +- ...th-response-header-filter-no-valid-headers.out.yaml | 4 ++-- ...tproute-with-response-header-filter-remove.out.yaml | 2 +- ...-with-some-invalid-backend-refs-no-service.out.yaml | 4 ++-- .../testdata/httproute-with-sourceip-ratelimit.in.yaml | 2 +- .../httproute-with-sourceip-ratelimit.out.yaml | 2 +- ...with-urlrewrite-filter-invalid-filter-type.out.yaml | 2 +- ...te-with-urlrewrite-filter-invalid-hostname.out.yaml | 2 +- ...urlrewrite-filter-invalid-multiple-filters.out.yaml | 2 +- ...e-with-urlrewrite-filter-invalid-path-type.out.yaml | 2 +- ...proute-with-urlrewrite-filter-invalid-path.out.yaml | 2 +- ...proute-with-urlrewrite-filter-missing-path.out.yaml | 2 +- .../testdata/httproutes-with-multiple-matches.out.yaml | 2 +- .../gatewayapi/testdata/tlsroute-multiple.out.yaml | 4 ++-- .../testdata/in/extension-xds-ir/http-route.yaml | 4 ++-- .../testdata/in/ratelimit-config/distinct-match.yaml | 2 +- .../distinct-remote-address-match.yaml | 2 +- .../in/ratelimit-config/empty-header-matches.yaml | 2 +- .../ratelimit-config/masked-remote-address-match.yaml | 2 +- .../testdata/in/ratelimit-config/multiple-matches.yaml | 4 ++-- .../testdata/in/ratelimit-config/multiple-routes.yaml | 2 +- .../testdata/in/ratelimit-config/multiple-rules.yaml | 6 +++--- .../testdata/in/ratelimit-config/value-match.yaml | 2 +- .../xds/translator/testdata/in/xds-ir/accesslog.yaml | 2 +- .../testdata/in/xds-ir/http-route-direct-response.yaml | 2 +- .../testdata/in/xds-ir/http-route-mirror.yaml | 2 +- .../testdata/in/xds-ir/http-route-redirect.yaml | 2 +- .../testdata/in/xds-ir/http-route-request-headers.yaml | 2 +- .../in/xds-ir/http-route-response-add-headers.yaml | 2 +- .../xds-ir/http-route-response-add-remove-headers.yaml | 2 +- .../in/xds-ir/http-route-response-remove-headers.yaml | 2 +- .../in/xds-ir/http-route-rewrite-url-fullpath.yaml | 2 +- .../in/xds-ir/http-route-rewrite-url-host.yaml | 2 +- .../in/xds-ir/http-route-weighted-backend.yaml | 2 +- .../in/xds-ir/http-route-weighted-invalid-backend.yaml | 4 ++-- .../xds/translator/testdata/in/xds-ir/http-route.yaml | 4 ++-- .../xds/translator/testdata/in/xds-ir/http2-route.yaml | 2 +- .../in/xds-ir/multiple-listeners-same-port.yaml | 8 ++++---- .../testdata/in/xds-ir/ratelimit-custom-domain.yaml | 4 ++-- .../testdata/in/xds-ir/ratelimit-sourceip.yaml | 4 ++-- .../xds/translator/testdata/in/xds-ir/ratelimit.yaml | 4 ++-- .../xds/translator/testdata/in/xds-ir/simple-tls.yaml | 4 ++-- release-notes/v0.3.0-rc.1.yaml | 10 +++++----- release-notes/v0.3.0.yaml | 6 +++--- release-notes/v0.4.0.yaml | 2 +- tools/linter/yamllint/.yamllint | 2 +- 116 files changed, 198 insertions(+), 198 deletions(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 7669b5ff075..71b2e49938c 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -86,19 +86,19 @@ jobs: with: name: envoy-gateway path: bin/ - + - name: Give Privileges To EG Binaries run: | chmod +x bin/linux/amd64/envoy-gateway chmod +x bin/linux/arm64/envoy-gateway # conformance - - name: Run Conformance Tests + - name: Run Conformance Tests env: KIND_NODE_TAG: ${{ matrix.version }} IMAGE_PULL_POLICY: IfNotPresent run: make conformance - + e2e-test: runs-on: ubuntu-latest needs: [build] @@ -114,14 +114,14 @@ jobs: with: name: envoy-gateway path: bin/ - + - name: Give Privileges To EG Binaries run: | chmod +x bin/linux/amd64/envoy-gateway chmod +x bin/linux/arm64/envoy-gateway # E2E - - name: Run E2E Tests + - name: Run E2E Tests env: KIND_NODE_TAG: ${{ matrix.version }} IMAGE_PULL_POLICY: IfNotPresent diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 90f3bfa6041..46b987e969e 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -34,7 +34,7 @@ jobs: - name: Generate EG Pages run: make docs - # Upload docs for GitHub Pages + # Upload docs for GitHub Pages - name: Upload GitHub Pages artifact uses: actions/upload-pages-artifact@v1.0.9 with: diff --git a/.github/workflows/latest_release.yaml b/.github/workflows/latest_release.yaml index cefd48e7632..bff1d402c46 100644 --- a/.github/workflows/latest_release.yaml +++ b/.github/workflows/latest_release.yaml @@ -17,7 +17,7 @@ jobs: run: make generate-manifests IMAGE=envoyproxy/gateway-dev TAG=latest OUTPUT_DIR=release-artifacts - name: Build egctl latest multiarch binaries - run: | + run: | make build-multiarch BINS="egctl" tar -zcvf egctl_latest_linux_amd64.tar.gz bin/linux/amd64/ tar -zcvf egctl_latest_linux_arm64.tar.gz bin/linux/arm64/ @@ -63,7 +63,7 @@ jobs: egctl_latest_darwin_arm64.tar.gz body: | This is the "latest" release of **Envoy Gateway**, which contains the most recent commits from the main branch. - + This release **might not be stable**. It is only intended for developers wishing to try out the latest features in Envoy Gateway, some of which may not be fully implemented. @@ -75,7 +75,7 @@ jobs: ``` # Check if latest release and tag are created properly, - # if not, the workflow needs to report an error, + # if not, the workflow needs to report an error, # let maintainers be aware of it and rerun it manually. # After Recreate the Latest Release and Tag, we need to sleep some time to wait # new tag and release are created before checking it. diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ec218df6205..24d26f1e6c3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,7 +3,7 @@ name: Release on: push: # Sequence of patterns matched against refs/tags - tags: + tags: - "v*.*.*" jobs: release: diff --git a/.github/workflows/retest.yaml b/.github/workflows/retest.yaml index 71f9b5e5a19..90c604cdc1c 100644 --- a/.github/workflows/retest.yaml +++ b/.github/workflows/retest.yaml @@ -21,10 +21,10 @@ jobs: console.log(`Comment: ${comment}`); console.log(`Contains Trigger: ${containsTrigger}`); return containsTrigger; - + - name: Install @octokit/core run: npm install @octokit/core@^3 - + - name: Rerun Action if: steps.check_comment.outputs.result == 'true' uses: actions/github-script@v6 diff --git a/examples/kubernetes/grpc-routing.yaml b/examples/kubernetes/grpc-routing.yaml index 388dc09aa4f..c1e922d11a1 100644 --- a/examples/kubernetes/grpc-routing.yaml +++ b/examples/kubernetes/grpc-routing.yaml @@ -66,16 +66,16 @@ kind: GRPCRoute metadata: name: yages labels: - example: grpc-routing + example: grpc-routing spec: parentRefs: - - name: example-gateway + - name: example-gateway hostnames: - "grpc-example.com" rules: - backendRefs: - group: "" kind: Service - name: yages + name: yages port: 9000 weight: 1 diff --git a/examples/loki/loki.yaml b/examples/loki/loki.yaml index 6cffb095f55..3f15a75b45e 100644 --- a/examples/loki/loki.yaml +++ b/examples/loki/loki.yaml @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: Helm data: runtime-config.yaml: | - + {} --- # Source: loki/templates/service-memberlist.yaml diff --git a/examples/otel-collector/helm-values.yaml b/examples/otel-collector/helm-values.yaml index a17d7ed5503..b01294253a3 100644 --- a/examples/otel-collector/helm-values.yaml +++ b/examples/otel-collector/helm-values.yaml @@ -17,7 +17,7 @@ config: key: loki.attribute.labels # k8s.pod.name is OpenTelemetry format for Kubernetes Pod name, # Loki will convert this to k8s_pod_name label. - value: k8s.pod.name, k8s.namespace.name + value: k8s.pod.name, k8s.namespace.name receivers: otlp: protocols: diff --git a/internal/cmd/egctl/testdata/translate/in/default-resources.yaml b/internal/cmd/egctl/testdata/translate/in/default-resources.yaml index d36c7913460..4eb7e3711c3 100644 --- a/internal/cmd/egctl/testdata/translate/in/default-resources.yaml +++ b/internal/cmd/egctl/testdata/translate/in/default-resources.yaml @@ -161,7 +161,7 @@ metadata: name: endpointslice-providedBackend namespace: default labels: - kubernetes.io/service-name: providedBackend + kubernetes.io/service-name: providedBackend addressType: IPv4 ports: - name: http diff --git a/internal/cmd/egctl/testdata/translate/in/invalid-envoyproxy.yaml b/internal/cmd/egctl/testdata/translate/in/invalid-envoyproxy.yaml index 1fb211f14ed..0900c467672 100644 --- a/internal/cmd/egctl/testdata/translate/in/invalid-envoyproxy.yaml +++ b/internal/cmd/egctl/testdata/translate/in/invalid-envoyproxy.yaml @@ -2,7 +2,7 @@ apiVersion: config.gateway.envoyproxy.io/v1alpha1 kind: EnvoyProxy metadata: name: example - namespace: default + namespace: default spec: bootstrap: | admin: @@ -26,7 +26,7 @@ spec: group: config.gateway.envoyproxy.io kind: EnvoyProxy name: example - namespace: default + namespace: default --- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway diff --git a/internal/cmd/egctl/testdata/translate/in/valid-envoyproxy.yaml b/internal/cmd/egctl/testdata/translate/in/valid-envoyproxy.yaml index 20868890361..67f55ea8562 100644 --- a/internal/cmd/egctl/testdata/translate/in/valid-envoyproxy.yaml +++ b/internal/cmd/egctl/testdata/translate/in/valid-envoyproxy.yaml @@ -2,14 +2,14 @@ apiVersion: config.gateway.envoyproxy.io/v1alpha1 kind: EnvoyProxy metadata: name: example - namespace: default + namespace: default spec: provider: type: Kubernetes kubernetes: envoyService: annotations: - custom1: svc-annotation1 + custom1: svc-annotation1 --- apiVersion: gateway.networking.k8s.io/v1beta1 kind: GatewayClass @@ -21,7 +21,7 @@ spec: group: config.gateway.envoyproxy.io kind: EnvoyProxy name: example - namespace: default + namespace: default --- apiVersion: gateway.networking.k8s.io/v1beta1 kind: Gateway 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 33ffed026f6..d704f4a4c80 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 @@ -22,7 +22,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute - attachedRoutes: 0 + attachedRoutes: 0 conditions: - type: Programmed status: "True" @@ -57,7 +57,7 @@ httpRoutes: extensionRef: group: foo.example.io kind: Foo - name: test + name: test status: parents: - parentRef: 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 35759a2d59a..38a54291a75 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 @@ -22,7 +22,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute - attachedRoutes: 0 + attachedRoutes: 0 conditions: - type: Programmed status: "True" @@ -57,7 +57,7 @@ httpRoutes: extensionRef: group: foo.example.io kind: Foo - name: example + name: example status: parents: - parentRef: 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 ec80541ed1e..49e40e78a67 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 @@ -22,7 +22,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute - attachedRoutes: 0 + attachedRoutes: 0 conditions: - type: Programmed status: "True" @@ -57,7 +57,7 @@ httpRoutes: extensionRef: group: foo.example.io kind: Unsupported - name: test + name: test status: parents: - parentRef: 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 441d1d0d08e..59cae161da6 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 37e98d16926..8a89b57af5f 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 @@ -20,7 +20,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 0 conditions: - type: Programmed @@ -59,9 +59,9 @@ httpRoutes: status: "False" reason: NotAllowedByListeners message: No listeners included by this parent ref allowed this attachment. - - type: ResolvedRefs + - type: ResolvedRefs status: "True" - reason: ResolvedRefs + reason: ResolvedRefs message: Resolved all the Object references for the Route xdsIR: envoy-gateway-gateway-1: diff --git a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.in.yaml b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.in.yaml index b4355b39250..6418ac1093d 100644 --- a/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.in.yaml +++ b/internal/gatewayapi/testdata/gateway-with-listener-with-invalid-multiple-tls-configuration.in.yaml @@ -19,7 +19,7 @@ gateways: - name: tls-secret-ecdsa-1 - name: tls-secret-ecdsa-2 - name: tls-secret-1 - + secrets: - apiVersion: v1 kind: Secret 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 21b51761eb6..8de2133448b 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 @@ -30,7 +30,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute conditions: - type: Conflicted status: "True" @@ -81,9 +81,9 @@ httpRoutes: status: "False" reason: NoReadyListeners message: There are no ready listeners for this parent ref - - type: ResolvedRefs + - type: ResolvedRefs status: "True" - reason: ResolvedRefs + reason: ResolvedRefs message: Resolved all the Object references for the Route tlsRoutes: - apiVersion: gateway.networking.k8s.io/v1alpha2 @@ -110,9 +110,9 @@ tlsRoutes: status: "False" reason: NoReadyListeners message: There are no ready listeners for this parent ref - - type: ResolvedRefs + - type: ResolvedRefs status: "True" - reason: ResolvedRefs + reason: ResolvedRefs message: Resolved all the Object references for the Route xdsIR: envoy-gateway-gateway-1: 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 742dd35f4b5..3ddb5f7b2b2 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 @@ -28,7 +28,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute AttachedRoutes: 2 conditions: - type: Programmed @@ -44,7 +44,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute AttachedRoutes: 2 conditions: - type: Programmed 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 fabf37648c4..c03482cef47 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 @@ -28,7 +28,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute conditions: - type: Conflicted status: "True" @@ -43,7 +43,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute conditions: - type: Conflicted status: "True" @@ -81,9 +81,9 @@ httpRoutes: status: "False" reason: NoReadyListeners message: There are no ready listeners for this parent ref - - type: ResolvedRefs + - type: ResolvedRefs status: "True" - reason: ResolvedRefs + reason: ResolvedRefs message: Resolved all the Object references for the Route xdsIR: envoy-gateway-gateway-1: 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 14b89b6bb28..95bf36b4a69 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 @@ -27,7 +27,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute AttachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.in.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.in.yaml index 60b6d9cdb4f..b6078734a8d 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-header-match.in.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-header-match.in.yaml @@ -7,7 +7,7 @@ gateways: spec: gatewayClassName: envoy-gateway-class listeners: - - name: http + - name: http protocol: HTTP port: 80 allowedRoutes: @@ -23,13 +23,13 @@ grpcRoutes: parentRefs: - namespace: envoy-gateway name: gateway-1 - sectionName: http + sectionName: http rules: - matches: - headers: - type: Exact name: magic - value: foo + value: foo backendRefs: - name: service-1 port: 8080 diff --git a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml index eed57ad78ed..e78eb2a70a2 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-header-match.out.yaml @@ -20,7 +20,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -47,7 +47,7 @@ grpcRoutes: - headers: - type: Exact name: magic - value: foo + value: foo backendRefs: - name: service-1 port: 8080 @@ -78,11 +78,11 @@ xdsIR: port: 10080 hostnames: - "*" - isHTTP2: true + isHTTP2: true routes: - name: default-grpcroute-1-rule-0-match-0-* headerMatches: - - name: "magic" + - name: "magic" exact: "foo" destinations: - host: 7.7.7.7 diff --git a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.in.yaml b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.in.yaml index d427d1c7736..56dbf4ed110 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.in.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.in.yaml @@ -7,7 +7,7 @@ gateways: spec: gatewayClassName: envoy-gateway-class listeners: - - name: http + - name: http protocol: HTTP port: 80 allowedRoutes: @@ -23,14 +23,14 @@ grpcRoutes: parentRefs: - namespace: envoy-gateway name: gateway-1 - sectionName: http + sectionName: http rules: - filters: - type: "RequestHeaderModifier" requestHeaderModifier: add: - name: "my-header" - value: "foo" + value: "foo" backendRefs: - name: service-1 port: 8080 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 93b9a4848e6..ea1c7f95262 100644 --- a/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml +++ b/internal/gatewayapi/testdata/grpcroute-with-request-header-modifier.out.yaml @@ -20,7 +20,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -48,7 +48,7 @@ grpcRoutes: requestHeaderModifier: add: - name: my-header - value: foo + value: foo backendRefs: - name: service-1 port: 8080 @@ -79,11 +79,11 @@ xdsIR: port: 10080 hostnames: - "*" - isHTTP2: true + isHTTP2: true routes: - name: default-grpcroute-1-rule-0-match--1-* addRequestHeaders: - - name: "my-header" + - name: "my-header" value: "foo" append: true destinations: diff --git a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml index cd3aa53a1a0..04916c41708 100644 --- a/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-empty-matches.out.yaml @@ -78,7 +78,7 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8080 - weight: 1 + weight: 1 infraIR: envoy-gateway-gateway-1: proxy: 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 6101daaef3d..48f5f5e1e9b 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.in.yaml index 27cf212753e..7a721b54686 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-duplicate-adds.in.yaml @@ -37,7 +37,7 @@ httpRoutes: filters: - type: RequestHeaderModifier requestHeaderModifier: - set: + set: - name: "set-header-1" value: "some-value" - name: "set-header-2" 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 848d3967a97..d554bff964c 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -55,7 +55,7 @@ httpRoutes: filters: - type: RequestHeaderModifier requestHeaderModifier: - set: + set: - name: "set-header-1" value: "some-value" - name: "set-header-2" 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 6f560fea5fd..b2e95362ad5 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 609297306ed..41e7a57643d 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.in.yaml index fd3cdf88210..7c22d7c62fe 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-header-values.in.yaml @@ -37,7 +37,7 @@ httpRoutes: filters: - type: RequestHeaderModifier requestHeaderModifier: - set: + set: - name: "example-header-1" value: "" add: 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 ce9d1eb69a5..52b344ecefe 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -55,7 +55,7 @@ httpRoutes: filters: - type: RequestHeaderModifier requestHeaderModifier: - set: + set: - name: "example-header-1" value: "" add: diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.in.yaml index 74fa4eaba59..978ef416a6d 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-empty-headers.in.yaml @@ -37,7 +37,7 @@ httpRoutes: filters: - type: RequestHeaderModifier requestHeaderModifier: - set: + set: - name: "" value: "some-value" add: 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 fe848f05a15..e81580c66cb 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 @@ -21,8 +21,8 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute - attachedRoutes: 0 + kind: GRPCRoute + attachedRoutes: 0 conditions: - type: Programmed status: "True" @@ -55,7 +55,7 @@ httpRoutes: filters: - type: RequestHeaderModifier requestHeaderModifier: - set: + set: - name: "" value: "some-value" add: diff --git a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.in.yaml b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.in.yaml index 193fe86698a..ecdaf8f42dd 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-invalid-headers.in.yaml @@ -37,7 +37,7 @@ httpRoutes: filters: - type: RequestHeaderModifier requestHeaderModifier: - set: + set: - name: "example:1" value: "some-value" - name: "good-header" 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 dc9b1b30c2e..42853facaab 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 @@ -21,8 +21,8 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute - attachedRoutes: 0 + kind: GRPCRoute + attachedRoutes: 0 conditions: - type: Programmed status: "True" @@ -55,7 +55,7 @@ httpRoutes: filters: - type: RequestHeaderModifier requestHeaderModifier: - set: + set: - name: "example:1" value: "some-value" - name: "good-header" 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 067e9caff93..2abe256e2b4 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 a35f0233a08..10c42c51c5a 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 @@ -21,8 +21,8 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute - attachedRoutes: 0 + kind: GRPCRoute + attachedRoutes: 0 conditions: - type: Programmed status: "True" 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 c5837381213..d6c4626e9c2 100644 --- a/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-header-filter-remove.out.yaml @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 f09f1f92eac..eddeae921f4 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 @@ -20,7 +20,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -79,7 +79,7 @@ xdsIR: - name: default-httproute-1-rule-0-match-0-* pathMatch: exact: "/exact" - backendWeights: + backendWeights: invalid: 1 directResponse: statusCode: 500 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 77a2d9d0aa4..15d81da4795 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 @@ -20,7 +20,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -81,7 +81,7 @@ xdsIR: - name: default-httproute-1-rule-0-match-0-* pathMatch: exact: "/exact" - backendWeights: + backendWeights: invalid: 1 directResponse: statusCode: 500 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 3d302a55cce..e65acdb4240 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 @@ -20,7 +20,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -80,7 +80,7 @@ xdsIR: - name: default-httproute-1-rule-0-match-0-* pathMatch: exact: "/exact" - backendWeights: + backendWeights: invalid: 1 directResponse: statusCode: 500 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 38cfc763208..96eec55e1bc 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 @@ -20,7 +20,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -78,7 +78,7 @@ xdsIR: - name: default-httproute-1-rule-0-match-0-* pathMatch: exact: "/exact" - backendWeights: + backendWeights: invalid: 1 directResponse: statusCode: 500 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 e170fe730a7..91947d8b7ce 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 @@ -20,7 +20,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -79,7 +79,7 @@ xdsIR: - name: default-httproute-1-rule-0-match-0-* pathMatch: exact: "/exact" - backendWeights: + backendWeights: invalid: 1 directResponse: statusCode: 500 diff --git a/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml b/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml index a5c405535d6..3bd31d66bf0 100644 --- a/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-invalid-ratelimitfilter.out.yaml @@ -22,7 +22,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute - attachedRoutes: 0 + attachedRoutes: 0 conditions: - type: Programmed status: "True" @@ -57,7 +57,7 @@ httpRoutes: extensionRef: group: gateway.envoyproxy.io kind: RateLimitFilter - name: test + name: test status: parents: - parentRef: diff --git a/internal/gatewayapi/testdata/httproute-with-non-existent-authenfilter-ref.in.yaml b/internal/gatewayapi/testdata/httproute-with-non-existent-authenfilter-ref.in.yaml index 7fdb47e419c..da672ca499e 100644 --- a/internal/gatewayapi/testdata/httproute-with-non-existent-authenfilter-ref.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-non-existent-authenfilter-ref.in.yaml @@ -39,5 +39,5 @@ httpRoutes: extensionRef: group: gateway.envoyproxy.io kind: AuthenticationFilter - name: non-exist + name: non-exist 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 981af58137e..51534991812 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 @@ -22,7 +22,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute - attachedRoutes: 0 + attachedRoutes: 0 conditions: - type: Programmed status: "True" @@ -57,7 +57,7 @@ httpRoutes: extensionRef: group: gateway.envoyproxy.io kind: AuthenticationFilter - name: non-exist + name: non-exist status: parents: - parentRef: diff --git a/internal/gatewayapi/testdata/httproute-with-non-matching-authenfilter-ref.in.yaml b/internal/gatewayapi/testdata/httproute-with-non-matching-authenfilter-ref.in.yaml index a571b30739c..cdf5030c62f 100644 --- a/internal/gatewayapi/testdata/httproute-with-non-matching-authenfilter-ref.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-non-matching-authenfilter-ref.in.yaml @@ -39,7 +39,7 @@ httpRoutes: extensionRef: group: gateway.envoyproxy.io kind: AuthenticationFilter - name: test + name: test authenticationFilters: - apiVersion: gateway.envoyproxy.io/v1alpha1 kind: AuthenticationFilter 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 2a7a4af45e7..528213af92f 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 @@ -22,7 +22,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute - attachedRoutes: 0 + attachedRoutes: 0 conditions: - type: Programmed status: "True" @@ -57,7 +57,7 @@ httpRoutes: extensionRef: group: gateway.envoyproxy.io kind: AuthenticationFilter - name: test + name: test status: parents: - parentRef: 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 99f13925158..cf4bc21c460 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 0 conditions: - type: Programmed 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 0f521547fed..92b0fec3731 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 8b96017249e..caf2893c674 100644 --- a/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-redirect-filter-hostname.out.yaml @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 753a07e104e..8ee4e91fce0 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 @@ -21,8 +21,8 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute - attachedRoutes: 0 + kind: GRPCRoute + attachedRoutes: 0 conditions: - type: Programmed status: "True" 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 753cd1cb487..7f6467e1e12 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 @@ -21,8 +21,8 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute - attachedRoutes: 0 + kind: GRPCRoute + attachedRoutes: 0 conditions: - type: Programmed status: "True" 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 864c3430831..9654ab7e378 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 @@ -21,8 +21,8 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute - attachedRoutes: 0 + kind: GRPCRoute + attachedRoutes: 0 conditions: - type: Programmed status: "True" 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 fe6d026b007..4c3e601e1c5 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.in.yaml index e73d2263433..cea778dd95b 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-adds.in.yaml @@ -37,7 +37,7 @@ httpRoutes: filters: - type: ResponseHeaderModifier responseHeaderModifier: - set: + set: - name: "set-header-1" value: "some-value" - name: "set-header-2" 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 12ab7b23d54..0c2debcd6d3 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -55,7 +55,7 @@ httpRoutes: filters: - type: ResponseHeaderModifier responseHeaderModifier: - set: + set: - name: "set-header-1" value: "some-value" - name: "set-header-2" 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 2394f323261..96cf03ed11c 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.in.yaml index 001c927c230..42e37c41aaa 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-duplicate-adds.in.yaml @@ -37,7 +37,7 @@ httpRoutes: filters: - type: ResponseHeaderModifier responseHeaderModifier: - set: + set: - name: "set-header-1" value: "some-value" - name: "set-header-2" 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 abc3947d41f..f62fcff669f 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -55,7 +55,7 @@ httpRoutes: filters: - type: ResponseHeaderModifier responseHeaderModifier: - set: + set: - name: "set-header-1" value: "some-value" - name: "set-header-2" 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 843cff5f738..73426512f4f 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 4c1544ca474..4759b2fd253 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.in.yaml index ce9a34f01fa..d6e1c760913 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-header-values.in.yaml @@ -37,7 +37,7 @@ httpRoutes: filters: - type: ResponseHeaderModifier responseHeaderModifier: - set: + set: - name: "example-header-1" value: "" add: 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 ffcd8e2d082..6198030d85f 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -55,7 +55,7 @@ httpRoutes: filters: - type: ResponseHeaderModifier responseHeaderModifier: - set: + set: - name: "example-header-1" value: "" add: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.in.yaml index dad660ec223..2eb722baea5 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-empty-headers.in.yaml @@ -37,7 +37,7 @@ httpRoutes: filters: - type: ResponseHeaderModifier responseHeaderModifier: - set: + set: - name: "" value: "some-value" add: 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 efd7c77dbc2..1ba7e86a58d 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 @@ -21,8 +21,8 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute - attachedRoutes: 0 + kind: GRPCRoute + attachedRoutes: 0 conditions: - type: Programmed status: "True" @@ -55,7 +55,7 @@ httpRoutes: filters: - type: ResponseHeaderModifier responseHeaderModifier: - set: + set: - name: "" value: "some-value" add: diff --git a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.in.yaml b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.in.yaml index 511159ef07f..4c1a29d288e 100644 --- a/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-response-header-filter-invalid-headers.in.yaml @@ -37,7 +37,7 @@ httpRoutes: filters: - type: ResponseHeaderModifier responseHeaderModifier: - set: + set: - name: "example:1" value: "some-value" - name: "good-header" 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 3c9372947cf..e4153edd085 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 @@ -21,8 +21,8 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute - attachedRoutes: 0 + kind: GRPCRoute + attachedRoutes: 0 conditions: - type: Programmed status: "True" @@ -55,7 +55,7 @@ httpRoutes: filters: - type: ResponseHeaderModifier responseHeaderModifier: - set: + set: - name: "example:1" value: "some-value" - name: "good-header" 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 1a1a1c16d53..6203cc213cf 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 4cb70836604..93388811dfa 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 @@ -21,8 +21,8 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute - attachedRoutes: 0 + kind: GRPCRoute + attachedRoutes: 0 conditions: - type: Programmed status: "True" 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 25ec34294d4..e1150d5b4a5 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 cfa17ed498c..4802122b00f 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 @@ -20,7 +20,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed @@ -83,7 +83,7 @@ xdsIR: - name: default-httproute-1-rule-0-match-0-* pathMatch: exact: "/exact" - backendWeights: + backendWeights: invalid: 2 # The weighted clusters for invalid backend refs aren't part of the IR valid: 1 destinations: diff --git a/internal/gatewayapi/testdata/httproute-with-sourceip-ratelimit.in.yaml b/internal/gatewayapi/testdata/httproute-with-sourceip-ratelimit.in.yaml index caf6d64a9f3..7046b141e08 100644 --- a/internal/gatewayapi/testdata/httproute-with-sourceip-ratelimit.in.yaml +++ b/internal/gatewayapi/testdata/httproute-with-sourceip-ratelimit.in.yaml @@ -50,7 +50,7 @@ rateLimitFilters: type: Global global: rules: - - clientSelectors: + - clientSelectors: - sourceIP: 192.168.0.0/16 limit: requests: 10 diff --git a/internal/gatewayapi/testdata/httproute-with-sourceip-ratelimit.out.yaml b/internal/gatewayapi/testdata/httproute-with-sourceip-ratelimit.out.yaml index 98cd7091cb0..20b376167f0 100644 --- a/internal/gatewayapi/testdata/httproute-with-sourceip-ratelimit.out.yaml +++ b/internal/gatewayapi/testdata/httproute-with-sourceip-ratelimit.out.yaml @@ -98,7 +98,7 @@ xdsIR: - cidrMatch: cidr: "192.168.0.0/16" maskLen: 16 - headerMatches: [] + headerMatches: [] limit: requests: 10 unit: Hour 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 b1b950c637b..8a0e71afb37 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 @@ -21,7 +21,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 1 conditions: - type: Programmed 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 b6f2e16db8e..efbcfb868d1 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 @@ -22,7 +22,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute - attachedRoutes: 0 + attachedRoutes: 0 conditions: - type: Programmed status: "True" 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 2344b7b4f64..cbc85a5bec8 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 @@ -22,7 +22,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute - attachedRoutes: 0 + attachedRoutes: 0 conditions: - type: Programmed status: "True" 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 290957aea2a..8a6ede0a66b 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 @@ -22,7 +22,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute - attachedRoutes: 0 + attachedRoutes: 0 conditions: - type: Programmed status: "True" 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 a79014f7b28..52eb9ee2e29 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 @@ -22,7 +22,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute - attachedRoutes: 0 + attachedRoutes: 0 conditions: - type: Programmed status: "True" 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 275e8a62a51..f3f718574d0 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 @@ -22,7 +22,7 @@ gateways: kind: HTTPRoute - group: gateway.networking.k8s.io kind: GRPCRoute - attachedRoutes: 0 + attachedRoutes: 0 conditions: - type: Programmed status: "True" diff --git a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml index 818a11616d2..9186ca86c60 100644 --- a/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml +++ b/internal/gatewayapi/testdata/httproutes-with-multiple-matches.out.yaml @@ -20,7 +20,7 @@ gateways: - group: gateway.networking.k8s.io kind: HTTPRoute - group: gateway.networking.k8s.io - kind: GRPCRoute + kind: GRPCRoute attachedRoutes: 5 conditions: - type: Programmed diff --git a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml index 72872be212b..e449cfafca9 100644 --- a/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml +++ b/internal/gatewayapi/testdata/tlsroute-multiple.out.yaml @@ -21,7 +21,7 @@ gateways: supportedKinds: - group: gateway.networking.k8s.io kind: TLSRoute - attachedRoutes: 2 + attachedRoutes: 2 conditions: - type: Programmed status: "True" @@ -119,7 +119,7 @@ xdsIR: destinations: - host: 7.7.7.7 port: 8080 - weight: 1 + weight: 1 infraIR: envoy-gateway-gateway-1: proxy: diff --git a/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml b/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml index dea29d39d06..449f0571f36 100644 --- a/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml +++ b/internal/xds/translator/testdata/in/extension-xds-ir/http-route.yaml @@ -10,9 +10,9 @@ http: - name: user stringMatch: exact: "jason" - - name: test + - name: test stringMatch: - suffix: "end" + suffix: "end" queryParamMatches: - name: "debug" exact: "yes" diff --git a/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml index 109b76ce920..461405e3132 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/distinct-match.yaml @@ -18,4 +18,4 @@ routes: exact: "foo/bar" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 diff --git a/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml index b74f7504450..126423fac1f 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/distinct-remote-address-match.yaml @@ -20,4 +20,4 @@ routes: exact: "foo/bar" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 diff --git a/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml index 5e7faec8b6c..de53be9737f 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/empty-header-matches.yaml @@ -15,4 +15,4 @@ routes: exact: "foo/bar" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 diff --git a/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml index 1891126cd58..0cfe65b6224 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/masked-remote-address-match.yaml @@ -19,4 +19,4 @@ routes: exact: "foo/bar" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml index fc0ec0f7483..14ff04aad25 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-matches.yaml @@ -12,7 +12,7 @@ routes: - name: "x-user-id" exact: "one" - name: "x-user-id" - exact: "two" + exact: "two" limit: requests: 5 unit: second @@ -20,4 +20,4 @@ routes: exact: "foo/bar" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml index a158cb7d9fa..761e936ac7b 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-routes.yaml @@ -30,4 +30,4 @@ routes: exact: "foo/bar" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 diff --git a/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml b/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml index 42b297f2662..9cfe4156caf 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/multiple-rules.yaml @@ -18,10 +18,10 @@ routes: - name: "x-user-id" exact: "two" limit: - requests: 10 - unit: second + requests: 10 + unit: second pathMatch: exact: "foo/bar" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 diff --git a/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml b/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml index 1a3b847bf11..018b78a2190 100644 --- a/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml +++ b/internal/xds/translator/testdata/in/ratelimit-config/value-match.yaml @@ -18,4 +18,4 @@ routes: exact: "foo/bar" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 diff --git a/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml b/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml index 4740ddc8e75..3fe85c2f389 100644 --- a/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/accesslog.yaml @@ -28,7 +28,7 @@ http: hostnames: - "*" routes: - - name: "direct-route" + - name: "direct-route" destinations: - host: "1.2.3.4" port: 50000 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml index ffedf91b990..12ff0b778e6 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-direct-response.yaml @@ -6,7 +6,7 @@ http: hostnames: - "*" routes: - - name: "direct-route" + - name: "direct-route" destinations: - host: "1.2.3.4" port: 50000 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml index b79f54030ca..936b690bf05 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-mirror.yaml @@ -6,7 +6,7 @@ http: hostnames: - "*" routes: - - name: "mirror-route" + - name: "mirror-route" destinations: - host: "1.2.3.4" port: 50000 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml index 74c19ceb63c..96e87f7c621 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-redirect.yaml @@ -6,7 +6,7 @@ http: hostnames: - "*" routes: - - name: "redirect-route" + - name: "redirect-route" destinations: - host: "1.2.3.4" port: 50000 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml index 1561b7adc62..a75f97fa9b9 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-request-headers.yaml @@ -6,7 +6,7 @@ http: hostnames: - "*" routes: - - name: "request-header-route" + - name: "request-header-route" destinations: - host: "1.2.3.4" port: 50000 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml index d4b7fba7c9b..3cafd43593c 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-headers.yaml @@ -6,7 +6,7 @@ http: hostnames: - "*" routes: - - name: "response-header-route" + - name: "response-header-route" destinations: - host: "1.2.3.4" port: 50000 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml index 33629740a4c..01b888594ff 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-add-remove-headers.yaml @@ -6,7 +6,7 @@ http: hostnames: - "*" routes: - - name: "response-header-route" + - name: "response-header-route" destinations: - host: "1.2.3.4" port: 50000 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml index 49fb464caaf..f9fc78e32f3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-response-remove-headers.yaml @@ -6,7 +6,7 @@ http: hostnames: - "*" routes: - - name: "response-header-route" + - name: "response-header-route" destinations: - host: "1.2.3.4" port: 50000 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml index 32c9114460c..21a05fcbefd 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-fullpath.yaml @@ -6,7 +6,7 @@ http: hostnames: - "*" routes: - - name: "rewrite-route" + - name: "rewrite-route" pathMatch: prefix: "/origin" headerMatches: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml index c63d100436d..1c6af60e7fd 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-rewrite-url-host.yaml @@ -6,7 +6,7 @@ http: hostnames: - "*" routes: - - name: "rewrite-route" + - name: "rewrite-route" pathMatch: prefix: "/origin" headerMatches: diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml index e6d314d1f5e..ed038fb0874 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-backend.yaml @@ -5,7 +5,7 @@ http: hostnames: - "*" routes: - - name: "first-route" + - name: "first-route" destinations: - host: "1.1.1.1" port: 50001 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml index b0ee0913f36..fde9aa76907 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route-weighted-invalid-backend.yaml @@ -5,10 +5,10 @@ http: hostnames: - "*" routes: - - name: "first-route" + - name: "first-route" destinations: - host: "1.2.3.4" port: 50000 - backendWeights: + backendWeights: invalid: 1 valid: 1 diff --git a/internal/xds/translator/testdata/in/xds-ir/http-route.yaml b/internal/xds/translator/testdata/in/xds-ir/http-route.yaml index dea29d39d06..449f0571f36 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http-route.yaml @@ -10,9 +10,9 @@ http: - name: user stringMatch: exact: "jason" - - name: test + - name: test stringMatch: - suffix: "end" + suffix: "end" queryParamMatches: - name: "debug" exact: "yes" diff --git a/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml b/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml index 131d775c9bf..ff2282adb59 100644 --- a/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/http2-route.yaml @@ -4,7 +4,7 @@ http: port: 10080 hostnames: - "*" - isHTTP2: true + isHTTP2: true routes: - name: "first-route" pathMatch: diff --git a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml index 746c06db4b1..320dccaacf3 100644 --- a/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/multiple-listeners-same-port.yaml @@ -11,7 +11,7 @@ http: # byte slice representation of "key-data" privateKey: [107, 101, 121, 45, 100, 97, 116, 97] routes: - - name: "first-route" + - name: "first-route" destinations: - host: "1.2.3.4" port: 50000 @@ -27,7 +27,7 @@ http: # byte slice representation of "key-data" privateKey: [107, 101, 121, 45, 100, 97, 116, 97] routes: - - name: "second-route" + - name: "second-route" destinations: - host: "1.2.3.4" port: 50000 @@ -37,7 +37,7 @@ http: hostnames: - "example.com" routes: - - name: "third-route" + - name: "third-route" destinations: - host: "1.2.3.4" port: 50000 @@ -47,7 +47,7 @@ http: hostnames: - "example.net" routes: - - name: "fourth-route" + - name: "fourth-route" destinations: - host: "1.2.3.4" port: 50000 diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml index 4bdfb033cd0..c9c17210220 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-custom-domain.yaml @@ -19,7 +19,7 @@ http: exact: "foo/bar" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 - name: "second-route" rateLimit: global: @@ -34,7 +34,7 @@ http: exact: "example" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 - name: "third-route" rateLimit: global: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml index 0ced52fd98c..ef7602d291d 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit-sourceip.yaml @@ -19,7 +19,7 @@ http: exact: "foo/bar" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 - name: "second-route" rateLimit: global: @@ -34,7 +34,7 @@ http: exact: "example" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 - name: "third-route" rateLimit: global: diff --git a/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml b/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml index 4bdfb033cd0..c9c17210220 100644 --- a/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/ratelimit.yaml @@ -19,7 +19,7 @@ http: exact: "foo/bar" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 - name: "second-route" rateLimit: global: @@ -34,7 +34,7 @@ http: exact: "example" destinations: - host: "1.2.3.4" - port: 50000 + port: 50000 - name: "third-route" rateLimit: global: diff --git a/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml b/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml index 58e6970c8c8..38915b9046b 100644 --- a/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml +++ b/internal/xds/translator/testdata/in/xds-ir/simple-tls.yaml @@ -12,9 +12,9 @@ http: privateKey: [107, 101, 121, 45, 100, 97, 116, 97] - name: secret-2 serverCertificate: [99, 101, 114, 116, 45, 100, 97, 116, 97] - privateKey: [107, 101, 121, 45, 100, 97, 116, 97] + privateKey: [107, 101, 121, 45, 100, 97, 116, 97] routes: - - name: "first-route" + - name: "first-route" destinations: - host: "1.2.3.4" port: 50000 diff --git a/release-notes/v0.3.0-rc.1.yaml b/release-notes/v0.3.0-rc.1.yaml index 2182b05b65d..7cde6d6d67e 100644 --- a/release-notes/v0.3.0-rc.1.yaml +++ b/release-notes/v0.3.0-rc.1.yaml @@ -17,8 +17,8 @@ changes: Added Support for HTTPRoute URLRewrite Filter Added Support for HTTPRoute RequestMirror Filter Added Support for HTTPRoute ResponseHeaderModifier Filter - Added APIs to Manage Envoy Deployment - Added Support for Request Authentication + Added APIs to Manage Envoy Deployment + Added Support for Request Authentication Added Support for Global Rate Limiting Added Support for Routes ReferenceGrant Added Support for Namespace Server Config Type @@ -38,7 +38,7 @@ changes: Enabled GatewayInvalidRouteKind conformance test Enabled HTTPRoutePartiallyInvalidViaInvalidReferenceGrant conformance test Enabled HTTPRouteReferenceGrant conformance test - Enabled HTTPRouteMethodMatching conformance test + Enabled HTTPRouteMethodMatching conformance test - area: ir change: | @@ -56,9 +56,9 @@ changes: change: | Refactored Kubernetes Provider to Single Reconciler Upgraded Kube Provider Test Data Manifests to v0.6.0 - Removed Duplicate Settings from Bootstrap Config + Removed Duplicate Settings from Bootstrap Config Updated Certgen to Use EG Namespace Env - Added EnvoyProxy to Translator and Kube Infra Manager + Added EnvoyProxy to Translator and Kube Infra Manager Upgraded Envoyproxy Image to envoy-dev latest in Main Removed EG Logs Private Key diff --git a/release-notes/v0.3.0.yaml b/release-notes/v0.3.0.yaml index 384537c27a7..53a5d2c171b 100644 --- a/release-notes/v0.3.0.yaml +++ b/release-notes/v0.3.0.yaml @@ -28,7 +28,7 @@ changes: Added Support for HTTPRoute URLRewrite Filter Added Support for HTTPRoute RequestMirror Filter Added Support for HTTPRoute ResponseHeaderModifier Filter - Added Support for Request Authentication + Added Support for Request Authentication Added Support for Global Rate Limiting Added Support for Routes ReferenceGrant Added Support for Namespace Server Config Type @@ -69,9 +69,9 @@ changes: change: | Refactored Kubernetes Provider to Single Reconciler Upgraded Kube Provider Test Data Manifests to v0.6.1 - Removed Duplicate Settings from Bootstrap Config + Removed Duplicate Settings from Bootstrap Config Updated Certgen to Use EG Namespace Env - Added EnvoyProxy to Translator and Kube Infra Manager + Added EnvoyProxy to Translator and Kube Infra Manager Upgraded Envoyproxy Image to envoy-dev latest in Main Removed EG Logs Private Key diff --git a/release-notes/v0.4.0.yaml b/release-notes/v0.4.0.yaml index a4938621f97..d05676beaa2 100644 --- a/release-notes/v0.4.0.yaml +++ b/release-notes/v0.4.0.yaml @@ -24,7 +24,7 @@ changes: Envoy Proxy Pod and Container SecurityContext is now Configurable Added Custom Envoy Gateway Extensions Framework Added Support for Service Method Match in GRPCRoute - Fixed a Bug in the Extension Hooks for xDS Virtual Hosts and Routes + Fixed a Bug in the Extension Hooks for xDS Virtual Hosts and Routes - area: ci-tooling-testing change: | diff --git a/tools/linter/yamllint/.yamllint b/tools/linter/yamllint/.yamllint index 1d944440e84..9bafddf18f0 100644 --- a/tools/linter/yamllint/.yamllint +++ b/tools/linter/yamllint/.yamllint @@ -51,7 +51,7 @@ rules: new-line-at-end-of-file: enable new-lines: type: unix - trailing-spaces: disable + trailing-spaces: enable truthy: check-keys: false # GitHub Actions uses "on:" as a key level: warning