From a46259dec2b981dd843e365242af8e7d53fcad41 Mon Sep 17 00:00:00 2001 From: Guy Daich Date: Tue, 27 Feb 2024 17:01:12 -0600 Subject: [PATCH 1/2] use latest conformance in tests and docs Signed-off-by: Guy Daich --- examples/kubernetes/application.yaml | 2 +- examples/kubernetes/http-routing.yaml | 8 +- examples/kubernetes/mergepatch.yaml | 2 +- examples/kubernetes/quickstart.yaml | 2 +- examples/kubernetes/tcp-routing.yaml | 4 +- examples/kubernetes/tls-passthrough.yaml | 2 +- examples/kubernetes/tls-termination.yaml | 2 +- .../translate/in/echo-gateway-api.yaml | 2 +- .../translate/in/envoy-patch-policy.yaml | 2 +- .../jwt-single-route-single-match-to-xds.yaml | 2 +- .../testdata/translate/in/quickstart.yaml | 2 +- .../content/en/latest/user/circuit-breaker.md | 96 +------------------ .../content/en/latest/user/deployment-mode.md | 4 +- .../en/latest/user/http-request-mirroring.md | 2 +- .../en/latest/user/http-traffic-splitting.md | 2 +- site/content/en/latest/user/tcp-routing.md | 4 +- test/e2e/base/manifests.yaml | 14 +-- 17 files changed, 30 insertions(+), 122 deletions(-) diff --git a/examples/kubernetes/application.yaml b/examples/kubernetes/application.yaml index 27df9d63dd5..f5fa1b75cb3 100644 --- a/examples/kubernetes/application.yaml +++ b/examples/kubernetes/application.yaml @@ -37,7 +37,7 @@ spec: spec: serviceAccountName: backend containers: - - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + - image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e imagePullPolicy: IfNotPresent name: backend ports: diff --git a/examples/kubernetes/http-routing.yaml b/examples/kubernetes/http-routing.yaml index bbfc6cec8e0..2aadf48b6fc 100644 --- a/examples/kubernetes/http-routing.yaml +++ b/examples/kubernetes/http-routing.yaml @@ -56,7 +56,7 @@ spec: spec: containers: - name: example-backend - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e env: - name: POD_NAME valueFrom: @@ -119,7 +119,7 @@ spec: spec: containers: - name: foo-backend - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e env: - name: POD_NAME valueFrom: @@ -186,7 +186,7 @@ spec: spec: containers: - name: bar-backend - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e env: - name: POD_NAME valueFrom: @@ -233,7 +233,7 @@ spec: spec: containers: - name: bar-canary-backend - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e env: - name: POD_NAME valueFrom: diff --git a/examples/kubernetes/mergepatch.yaml b/examples/kubernetes/mergepatch.yaml index 87b34eb4b16..20cf575c752 100644 --- a/examples/kubernetes/mergepatch.yaml +++ b/examples/kubernetes/mergepatch.yaml @@ -78,7 +78,7 @@ spec: spec: serviceAccountName: backend containers: - - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + - image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e imagePullPolicy: IfNotPresent name: backend ports: diff --git a/examples/kubernetes/quickstart.yaml b/examples/kubernetes/quickstart.yaml index e70a4df5996..dcc84ef11c2 100644 --- a/examples/kubernetes/quickstart.yaml +++ b/examples/kubernetes/quickstart.yaml @@ -54,7 +54,7 @@ spec: spec: serviceAccountName: backend containers: - - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + - image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e imagePullPolicy: IfNotPresent name: backend ports: diff --git a/examples/kubernetes/tcp-routing.yaml b/examples/kubernetes/tcp-routing.yaml index cc203bd1cf3..619e6662435 100644 --- a/examples/kubernetes/tcp-routing.yaml +++ b/examples/kubernetes/tcp-routing.yaml @@ -70,7 +70,7 @@ spec: version: v1 spec: containers: - - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + - image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e imagePullPolicy: IfNotPresent name: backend-1 ports: @@ -104,7 +104,7 @@ spec: version: v1 spec: containers: - - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + - image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e imagePullPolicy: IfNotPresent name: backend-2 ports: diff --git a/examples/kubernetes/tls-passthrough.yaml b/examples/kubernetes/tls-passthrough.yaml index cde29cb0a74..2fd44e67d73 100644 --- a/examples/kubernetes/tls-passthrough.yaml +++ b/examples/kubernetes/tls-passthrough.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: passthrough-echoserver - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e ports: - containerPort: 8443 env: diff --git a/examples/kubernetes/tls-termination.yaml b/examples/kubernetes/tls-termination.yaml index 0ffc34c4637..14eb84af022 100644 --- a/examples/kubernetes/tls-termination.yaml +++ b/examples/kubernetes/tls-termination.yaml @@ -63,7 +63,7 @@ spec: spec: serviceAccountName: backend containers: - - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + - image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e imagePullPolicy: IfNotPresent name: backend ports: diff --git a/internal/cmd/egctl/testdata/translate/in/echo-gateway-api.yaml b/internal/cmd/egctl/testdata/translate/in/echo-gateway-api.yaml index f0e412d92b0..57e3253c71a 100644 --- a/internal/cmd/egctl/testdata/translate/in/echo-gateway-api.yaml +++ b/internal/cmd/egctl/testdata/translate/in/echo-gateway-api.yaml @@ -55,7 +55,7 @@ spec: spec: serviceAccountName: backend containers: - - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + - image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e imagePullPolicy: IfNotPresent name: backend ports: diff --git a/internal/cmd/egctl/testdata/translate/in/envoy-patch-policy.yaml b/internal/cmd/egctl/testdata/translate/in/envoy-patch-policy.yaml index e020bc9d429..be98f705f71 100644 --- a/internal/cmd/egctl/testdata/translate/in/envoy-patch-policy.yaml +++ b/internal/cmd/egctl/testdata/translate/in/envoy-patch-policy.yaml @@ -59,7 +59,7 @@ spec: spec: serviceAccountName: backend containers: - - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + - image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e imagePullPolicy: IfNotPresent name: backend ports: diff --git a/internal/cmd/egctl/testdata/translate/in/jwt-single-route-single-match-to-xds.yaml b/internal/cmd/egctl/testdata/translate/in/jwt-single-route-single-match-to-xds.yaml index 14efe586c4e..cef3ccc5383 100644 --- a/internal/cmd/egctl/testdata/translate/in/jwt-single-route-single-match-to-xds.yaml +++ b/internal/cmd/egctl/testdata/translate/in/jwt-single-route-single-match-to-xds.yaml @@ -55,7 +55,7 @@ spec: spec: serviceAccountName: backend containers: - - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + - image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e imagePullPolicy: IfNotPresent name: backend ports: diff --git a/internal/cmd/egctl/testdata/translate/in/quickstart.yaml b/internal/cmd/egctl/testdata/translate/in/quickstart.yaml index f0e412d92b0..57e3253c71a 100644 --- a/internal/cmd/egctl/testdata/translate/in/quickstart.yaml +++ b/internal/cmd/egctl/testdata/translate/in/quickstart.yaml @@ -55,7 +55,7 @@ spec: spec: serviceAccountName: backend containers: - - image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e + - image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e imagePullPolicy: IfNotPresent name: backend ports: diff --git a/site/content/en/latest/user/circuit-breaker.md b/site/content/en/latest/user/circuit-breaker.md index 9247d179955..16fa2681786 100644 --- a/site/content/en/latest/user/circuit-breaker.md +++ b/site/content/en/latest/user/circuit-breaker.md @@ -20,99 +20,7 @@ This instantiated resource can be linked to a [Gateway][], [HTTPRoute][] or [GRP ### Install Envoy Gateway -* Follow the installation step from the [Quickstart Guide](../quickstart) to install Envoy Gateway. There is no need to apply the quickstart manifests. - -### Install the httpbin backend - -* We will use the [Httpbin project] as a backend in order to simulate a degraded service that responds slowly. Install `httpbin` and other Envoy Gateway resources (`GatewayClass`, `Gateway`, `HTTPRoute`) by applying the following manifests: - -```shell -cat < Date: Tue, 27 Feb 2024 17:06:51 -0600 Subject: [PATCH 2/2] fix circuit breaker guide Signed-off-by: Guy Daich --- site/content/en/latest/user/circuit-breaker.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/site/content/en/latest/user/circuit-breaker.md b/site/content/en/latest/user/circuit-breaker.md index 16fa2681786..b870b116a13 100644 --- a/site/content/en/latest/user/circuit-breaker.md +++ b/site/content/en/latest/user/circuit-breaker.md @@ -27,7 +27,7 @@ This instantiated resource can be linked to a [Gateway][], [HTTPRoute][] or [GRP ## Test and customize circuit breaker settings -This example will simulate a degraded backend that responds within 10 seconds by calling the `/delayed/10` endpoint of httpbin. The hey tool will be used to generate 100 concurrent requests. +This example will simulate a degraded backend that responds within 10 seconds by adding the `?delay=10s` query parameter to API calls. The hey tool will be used to generate 100 concurrent requests. ```shell hey -n 100 -c 100 -host "www.example.com" http://${GATEWAY_HOST}/?delay=10s @@ -72,7 +72,7 @@ spec: targetRef: group: gateway.networking.k8s.io kind: HTTPRoute - name: httpbin + name: backend namespace: default circuitBreaker: maxPendingRequests: 0 @@ -83,7 +83,7 @@ EOF Execute the load simulation again. ```shell -hey -n 100 -c 100 -host "www.example.com" http://${GATEWAY_HOST}/delay/10 +hey -n 100 -c 100 -host "www.example.com" http://${GATEWAY_HOST}/?delay=10s ``` ```console @@ -120,5 +120,4 @@ With the new circuit breaker settings, and due to the slowness of the backend, o [Gateway]: https://gateway-api.sigs.k8s.io/api-types/gateway/ [HTTPRoute]: https://gateway-api.sigs.k8s.io/api-types/httproute/ [GRPCRoute]: https://gateway-api.sigs.k8s.io/api-types/grpcroute/ -[Hey project]: https://github.com/rakyll/hey -[Httpbin project]: https://github.com/postmanlabs/httpbin \ No newline at end of file +[Hey project]: https://github.com/rakyll/hey \ No newline at end of file