From a6590bf81463d5cfeadc817f5238a01507ab1a9b Mon Sep 17 00:00:00 2001
From: Huabing Zhao <zhaohuabing@gmail.com>
Date: Tue, 16 Jul 2024 12:53:07 +0800
Subject: [PATCH] chore: move zipkin test resources out of the base (#3864)

move zipkin test resources out of the base

Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
---
 test/e2e/base/manifests.yaml          | 64 ---------------------------
 test/e2e/testdata/tracing-zipkin.yaml | 64 +++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/test/e2e/base/manifests.yaml b/test/e2e/base/manifests.yaml
index 4ffc420b12f..320f364fd7e 100644
--- a/test/e2e/base/manifests.yaml
+++ b/test/e2e/base/manifests.yaml
@@ -934,67 +934,3 @@ spec:
     protocol: TCP
     port: 19001
     targetPort: 19001
----
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: eg-special-case
-  namespace: gateway-conformance-infra
-spec:
-  gatewayClassName: "{GATEWAY_CLASS_NAME}"
-  listeners:
-  - name: http
-    port: 80
-    protocol: HTTP
-    allowedRoutes:
-      namespaces:
-        from: All
-  infrastructure:
-    parametersRef:
-      group: gateway.envoyproxy.io
-      kind: EnvoyProxy
-      name: zipkin-tracing
----
-#  This is a EnvoyProxy used for Zipkin tracing and will
-#  target to the eg-special-case Gateway
-apiVersion: gateway.envoyproxy.io/v1alpha1
-kind: EnvoyProxy
-metadata:
-  name: zipkin-tracing
-  namespace: gateway-conformance-infra
-spec:
-  logging:
-    level:
-      default: debug
-  telemetry:
-    tracing:
-      provider:
-        type: Zipkin
-        backendRefs:
-        - name: otel-collector
-          namespace: monitoring
-          port: 9411
-        zipkin:
-          enable128BitTraceId: true
-      customTags:
-        "provider":
-          type: Literal
-          literal:
-            value: "zipkin"
-        "k8s.cluster.name":
-          type: Literal
-          literal:
-            value: "envoy-gateway"
-        "k8s.pod.name":
-          type: Environment
-          environment:
-            name: ENVOY_POD_NAME
-            defaultValue: "-"
-        "k8s.namespace.name":
-          type: Environment
-          environment:
-            name: ENVOY_GATEWAY_NAMESPACE
-            defaultValue: "envoy-gateway-system"
-  shutdown:
-    drainTimeout: 5s
-    minDrainDuration: 1s
diff --git a/test/e2e/testdata/tracing-zipkin.yaml b/test/e2e/testdata/tracing-zipkin.yaml
index 8cb2e10c1e6..1f7aaf0a66f 100644
--- a/test/e2e/testdata/tracing-zipkin.yaml
+++ b/test/e2e/testdata/tracing-zipkin.yaml
@@ -1,4 +1,68 @@
 apiVersion: gateway.networking.k8s.io/v1
+kind: Gateway
+metadata:
+  name: eg-special-case
+  namespace: gateway-conformance-infra
+spec:
+  gatewayClassName: "{GATEWAY_CLASS_NAME}"
+  listeners:
+    - name: http
+      port: 80
+      protocol: HTTP
+      allowedRoutes:
+        namespaces:
+          from: All
+  infrastructure:
+    parametersRef:
+      group: gateway.envoyproxy.io
+      kind: EnvoyProxy
+      name: zipkin-tracing
+---
+#  This is a EnvoyProxy used for Zipkin tracing and will
+#  target to the eg-special-case Gateway
+apiVersion: gateway.envoyproxy.io/v1alpha1
+kind: EnvoyProxy
+metadata:
+  name: zipkin-tracing
+  namespace: gateway-conformance-infra
+spec:
+  logging:
+    level:
+      default: debug
+  telemetry:
+    tracing:
+      provider:
+        type: Zipkin
+        backendRefs:
+          - name: otel-collector
+            namespace: monitoring
+            port: 9411
+        zipkin:
+          enable128BitTraceId: true
+      customTags:
+        "provider":
+          type: Literal
+          literal:
+            value: "zipkin"
+        "k8s.cluster.name":
+          type: Literal
+          literal:
+            value: "envoy-gateway"
+        "k8s.pod.name":
+          type: Environment
+          environment:
+            name: ENVOY_POD_NAME
+            defaultValue: "-"
+        "k8s.namespace.name":
+          type: Environment
+          environment:
+            name: ENVOY_GATEWAY_NAMESPACE
+            defaultValue: "envoy-gateway-system"
+  shutdown:
+    drainTimeout: 5s
+    minDrainDuration: 1s
+---
+apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: tracing-zipkin