From 1f684b0013c21d58b22d0a025afae773a5ecfc32 Mon Sep 17 00:00:00 2001
From: Petr McAllister <petr.mcallister@solo.io>
Date: Thu, 5 Jun 2025 14:04:37 -0700
Subject: [PATCH] Moved we tests from e2e to setup due Istio pending fix
 https://github.com/istio/ztunnel/pull/1570

Signed-off-by: Petr McAllister <petr.mcallister@solo.io>
---
 .../serviceentry/we/se-we-no-addr-out.yaml    | 61 ++++++++++++++++++
 .../serviceentry/we/se-we-no-addr.yaml        | 62 +++++++++++++++++++
 .../waypoint/testdata/common/test_apps.yaml   | 19 +++---
 3 files changed, 133 insertions(+), 9 deletions(-)
 create mode 100644 internal/kgateway/setup/testdata/serviceentry/we/se-we-no-addr-out.yaml
 create mode 100644 internal/kgateway/setup/testdata/serviceentry/we/se-we-no-addr.yaml

diff --git a/internal/kgateway/setup/testdata/serviceentry/we/se-we-no-addr-out.yaml b/internal/kgateway/setup/testdata/serviceentry/we/se-we-no-addr-out.yaml
new file mode 100644
index 00000000000..75efc61d561
--- /dev/null
+++ b/internal/kgateway/setup/testdata/serviceentry/we/se-we-no-addr-out.yaml
@@ -0,0 +1,61 @@
+clusters:
+- connectTimeout: 5s
+  edsClusterConfig:
+    edsConfig:
+      ads: {}
+      resourceApiVersion: V3
+  metadata: {}
+  name: istio-se_gwtest_se-b_se-b.serviceentry.com_8080
+  type: EDS
+- connectTimeout: 5s
+  edsClusterConfig:
+    edsConfig:
+      ads: {}
+      resourceApiVersion: V3
+  metadata: {}
+  name: kube_default_kubernetes_443
+  type: EDS
+endpoints:
+- clusterName: istio-se_gwtest_se-b_se-b.serviceentry.com_8080
+  endpoints:
+  - {}
+listeners:
+- address:
+    socketAddress:
+      address: '::'
+      ipv4Compat: true
+      portValue: 8080
+  filterChains:
+  - filters:
+    - name: envoy.filters.network.http_connection_manager
+      typedConfig:
+        '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
+        httpFilters:
+        - name: envoy.filters.http.router
+          typedConfig:
+            '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
+        mergeSlashes: true
+        normalizePath: true
+        rds:
+          configSource:
+            ads: {}
+            resourceApiVersion: V3
+          routeConfigName: listener~8080
+        statPrefix: http
+        useRemoteAddress: true
+    name: listener~8080
+  name: listener~8080
+routes:
+- ignorePortInHostMatching: true
+  name: listener~8080
+  virtualHosts:
+  - domains:
+    - se-b.serviceentry.com
+    name: listener~8080~se-b_serviceentry_com
+    routes:
+    - match:
+        prefix: /
+      name: listener~8080~se-b_serviceentry_com-route-0-httproute-route-to-hostname-gwtest-0-0-matcher-0
+      route:
+        cluster: istio-se_gwtest_se-b_se-b.serviceentry.com_8080
+        clusterNotFoundResponseCode: INTERNAL_SERVER_ERROR
diff --git a/internal/kgateway/setup/testdata/serviceentry/we/se-we-no-addr.yaml b/internal/kgateway/setup/testdata/serviceentry/we/se-we-no-addr.yaml
new file mode 100644
index 00000000000..b4da5d584b5
--- /dev/null
+++ b/internal/kgateway/setup/testdata/serviceentry/we/se-we-no-addr.yaml
@@ -0,0 +1,62 @@
+kind: Gateway
+apiVersion: gateway.networking.k8s.io/v1
+metadata:
+  name: http-gw-for-test
+  namespace: gwtest
+spec:
+  gatewayClassName: kgateway
+  listeners:
+  - protocol: HTTP
+    port: 8080
+    name: http
+    allowedRoutes:
+      namespaces:
+        from: All
+---
+apiVersion: gateway.networking.k8s.io/v1beta1
+kind: HTTPRoute
+metadata:
+  name: route-to-hostname
+  namespace: gwtest
+spec:
+  parentRefs:
+  - name: http-gw-for-test
+  hostnames:
+  - "se-b.serviceentry.com"
+  rules:
+  - backendRefs:
+    - name: se-b.serviceentry.com
+      port: 8080
+      kind: Hostname
+      group: networking.istio.io
+---
+apiVersion: networking.istio.io/v1
+kind: ServiceEntry
+metadata:
+  name: se-b
+  namespace: gwtest
+spec:
+  addresses:
+  - 244.244.0.2
+  hosts:
+  - se-b.serviceentry.com
+  location: MESH_INTERNAL
+  ports:
+  - number: 8080
+    name: http
+    protocol: HTTP
+    targetPort: 5678
+  resolution: STATIC
+  workloadSelector:
+    labels:
+      app: svc-b
+---
+apiVersion: networking.istio.io/v1
+kind: WorkloadEntry
+metadata:
+  name: empty-addr-workloadentry
+  namespace: gwtest
+  labels:
+    app: svc-b
+spec:
+  network: some-external-network
diff --git a/test/kubernetes/e2e/features/waypoint/testdata/common/test_apps.yaml b/test/kubernetes/e2e/features/waypoint/testdata/common/test_apps.yaml
index 09e1c9ccab9..0acaf14ca5b 100644
--- a/test/kubernetes/e2e/features/waypoint/testdata/common/test_apps.yaml
+++ b/test/kubernetes/e2e/features/waypoint/testdata/common/test_apps.yaml
@@ -237,12 +237,13 @@ spec:
 # we just include one here and expect it to do nothing
 # this acts as an assertion that we don't push invalid envoy and cause NACKs (due to invalid LbAddr)
 ##################################################################################################
----
-apiVersion: networking.istio.io/v1beta1
-kind: WorkloadEntry
-metadata:
-  name: empty-addr-workloadentry
-  labels:
-    app: svc-b
-spec:
-  network: some-external-network
+# TODO: This is pending Istio version that included this PR: https://github.com/istio/ztunnel/pull/1570 
+# ---
+# apiVersion: networking.istio.io/v1beta1
+# kind: WorkloadEntry
+# metadata:
+#   name: empty-addr-workloadentry
+#   labels:
+#     app: svc-b
+# spec:
+#   network: some-external-network