From 0de72b99a6a047ccc9c687798b4ab4f8d2afd56b Mon Sep 17 00:00:00 2001
From: Guy Daich <guy.daich@sap.com>
Date: Tue, 27 Feb 2024 19:13:19 -0600
Subject: [PATCH] chore: use most recent gateway api conformance backend
 (#2715)

* use latest conformance in tests and docs

Signed-off-by: Guy Daich <guy.daich@sap.com>

* fix circuit breaker guide

Signed-off-by: Guy Daich <guy.daich@sap.com>

---------

Signed-off-by: Guy Daich <guy.daich@sap.com>
Signed-off-by: zirain <zirain2009@gmail.com>
---
 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 | 105 +-----------------
 .../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, 34 insertions(+), 127 deletions(-)

diff --git a/examples/kubernetes/application.yaml b/examples/kubernetes/application.yaml
index 27df9d63dd52..f5fa1b75cb32 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 bbfc6cec8e08..2aadf48b6fc1 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 87b34eb4b16f..20cf575c752b 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 e70a4df59968..dcc84ef11c22 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 cc203bd1cf38..619e66624350 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 cde29cb0a749..2fd44e67d730 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 0ffc34c4637f..14eb84af022e 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 f0e412d92b07..57e3253c71a4 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 e020bc9d4294..be98f705f713 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 14efe586c4e8..cef3ccc53833 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 f0e412d92b07..57e3253c71a4 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 9247d1799556..b870b116a133 100644
--- a/site/content/en/latest/user/circuit-breaker.md
+++ b/site/content/en/latest/user/circuit-breaker.md
@@ -20,109 +20,17 @@ 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 <<EOF | kubectl apply -f -
-apiVersion: gateway.networking.k8s.io/v1
-kind: GatewayClass
-metadata:
-  name: eg
-spec:
-  controllerName: gateway.envoyproxy.io/gatewayclass-controller
----
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: eg
-spec:
-  gatewayClassName: eg
-  listeners:
-    - name: http
-      protocol: HTTP
-      port: 80
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: httpbin
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: httpbin
-  labels:
-    app: httpbin
-    service: httpbin
-spec:
-  ports:
-    - name: http
-      port: 80
-      targetPort: 80
-  selector:
-    app: httpbin
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: httpbin
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: httpbin
-      version: v1
-  template:
-    metadata:
-      labels:
-        app: httpbin
-        version: v1
-    spec:
-      serviceAccountName: httpbin
-      containers:
-        - image: docker.io/kennethreitz/httpbin
-          imagePullPolicy: IfNotPresent
-          name: httpbin
-          ports:
-            - containerPort: 80
----
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: httpbin
-spec:
-  parentRefs:
-    - name: eg
-  hostnames:
-    - "www.example.com"
-  rules:
-    - backendRefs:
-        - group: ""
-          kind: Service
-          name: httpbin
-          port: 80
-          weight: 1
-      matches:
-        - path:
-            type: PathPrefix
-            value: /
-
-EOF
-```
+* Follow the installation step from the [Quickstart Guide](../quickstart) to install Envoy Gateway and sample resources.
 
 ### Install the hey load testing tool
 * The `hey` CLI will be used to generate load and measure response times. Follow the installation instruction from the [Hey project] docs.   
 
 ## 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/10
+hey -n 100 -c 100 -host "www.example.com"  http://${GATEWAY_HOST}/?delay=10s
 ```
 
 ```console
@@ -164,7 +72,7 @@ spec:
   targetRef:
     group: gateway.networking.k8s.io
     kind: HTTPRoute
-    name: httpbin
+    name: backend
     namespace: default
   circuitBreaker:
     maxPendingRequests: 0
@@ -175,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
@@ -212,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
diff --git a/site/content/en/latest/user/deployment-mode.md b/site/content/en/latest/user/deployment-mode.md
index 66605e297a18..534a55754e8f 100644
--- a/site/content/en/latest/user/deployment-mode.md
+++ b/site/content/en/latest/user/deployment-mode.md
@@ -103,7 +103,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:
@@ -281,7 +281,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/http-request-mirroring.md b/site/content/en/latest/user/http-request-mirroring.md
index 95d3d0cfa541..ff95375f02c2 100644
--- a/site/content/en/latest/user/http-request-mirroring.md
+++ b/site/content/en/latest/user/http-request-mirroring.md
@@ -57,7 +57,7 @@ spec:
     spec:
       serviceAccountName: backend-2
       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/site/content/en/latest/user/http-traffic-splitting.md b/site/content/en/latest/user/http-traffic-splitting.md
index 49e6ca89c2fe..abc4a550ae31 100644
--- a/site/content/en/latest/user/http-traffic-splitting.md
+++ b/site/content/en/latest/user/http-traffic-splitting.md
@@ -128,7 +128,7 @@ spec:
     spec:
       serviceAccountName: backend-2
       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/site/content/en/latest/user/tcp-routing.md b/site/content/en/latest/user/tcp-routing.md
index d51c845f2066..27dd4ed0467e 100644
--- a/site/content/en/latest/user/tcp-routing.md
+++ b/site/content/en/latest/user/tcp-routing.md
@@ -112,7 +112,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:
@@ -146,7 +146,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/test/e2e/base/manifests.yaml b/test/e2e/base/manifests.yaml
index 73131cd99132..b2b19192b136 100644
--- a/test/e2e/base/manifests.yaml
+++ b/test/e2e/base/manifests.yaml
@@ -116,7 +116,7 @@ spec:
       containers:
       - name: infra-backend-v1
         # From https://github.com/kubernetes-sigs/ingress-controller-conformance/tree/master/images/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
         env:
         - name: POD_NAME
           valueFrom:
@@ -162,7 +162,7 @@ spec:
     spec:
       containers:
       - name: infra-backend-v2
-        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:
@@ -208,7 +208,7 @@ spec:
     spec:
       containers:
       - name: infra-backend-v3
-        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:
@@ -254,7 +254,7 @@ spec:
     spec:
       containers:
       - name: tls-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
         volumeMounts:
         - name: secret-volume
           mountPath: /etc/secret-volume
@@ -323,7 +323,7 @@ spec:
     spec:
       containers:
       - name: app-backend-v1
-        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:
@@ -369,7 +369,7 @@ spec:
     spec:
       containers:
       - name: app-backend-v2
-        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:
@@ -422,7 +422,7 @@ spec:
     spec:
       containers:
       - name: web-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: