From b5ca2ff9d46b627bd0c984aba25dc998b151523c Mon Sep 17 00:00:00 2001 From: Jakub Dyszkiewicz Date: Tue, 24 Sep 2024 14:57:40 +0200 Subject: [PATCH 1/3] test(e2e): traffic route test with default tr policy (#11523) Signed-off-by: Jakub Dyszkiewicz --- test/e2e_env/universal/trafficroute/traffic_route.go | 1 + test/e2e_env/universal/universal_suite_test.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/test/e2e_env/universal/trafficroute/traffic_route.go b/test/e2e_env/universal/trafficroute/traffic_route.go index 07f79f56a831..13ee6be19925 100644 --- a/test/e2e_env/universal/trafficroute/traffic_route.go +++ b/test/e2e_env/universal/trafficroute/traffic_route.go @@ -22,6 +22,7 @@ func TrafficRoute() { BeforeAll(func() { Expect(NewClusterSetup(). Install(MeshUniversal(meshName)). + Install(TrafficRouteUniversal(meshName)). Install(TestServerUniversal("dp-echo-1", meshName, WithArgs([]string{"echo", "--instance", "echo-v1"}), WithServiceVersion("v1"), diff --git a/test/e2e_env/universal/universal_suite_test.go b/test/e2e_env/universal/universal_suite_test.go index 3e2a5e16394e..a68945321499 100644 --- a/test/e2e_env/universal/universal_suite_test.go +++ b/test/e2e_env/universal/universal_suite_test.go @@ -89,7 +89,11 @@ var ( _ = Describe("Mtls", mtls.Policy, Ordered) _ = Describe("Reachable Services", reachableservices.ReachableServices, Ordered) _ = Describe("Apis", api.Api, Ordered) +<<<<<<< HEAD _ = Describe("Traffic Permission", trafficpermission.TrafficPermissionUniversal, Ordered) +======= + _ = Describe("Traffic Permission", trafficpermission.TrafficPermission, Ordered) +>>>>>>> a06022240 (test(e2e): traffic route test with default tr policy (#11523)) _ = Describe("Traffic Route", trafficroute.TrafficRoute, Ordered) _ = Describe("Zone Egress", zoneegress.ExternalServices, Ordered) _ = Describe("Virtual Outbound", virtualoutbound.VirtualOutbound, Ordered) From 1868623cca26409fb6c6cf5f134aeb77e0cd2b37 Mon Sep 17 00:00:00 2001 From: Marcin Skalski Date: Thu, 3 Oct 2024 11:09:15 +0200 Subject: [PATCH 2/3] chore(backport): fix conflict Signed-off-by: Marcin Skalski --- test/e2e_env/universal/universal_suite_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/e2e_env/universal/universal_suite_test.go b/test/e2e_env/universal/universal_suite_test.go index a68945321499..3e2a5e16394e 100644 --- a/test/e2e_env/universal/universal_suite_test.go +++ b/test/e2e_env/universal/universal_suite_test.go @@ -89,11 +89,7 @@ var ( _ = Describe("Mtls", mtls.Policy, Ordered) _ = Describe("Reachable Services", reachableservices.ReachableServices, Ordered) _ = Describe("Apis", api.Api, Ordered) -<<<<<<< HEAD _ = Describe("Traffic Permission", trafficpermission.TrafficPermissionUniversal, Ordered) -======= - _ = Describe("Traffic Permission", trafficpermission.TrafficPermission, Ordered) ->>>>>>> a06022240 (test(e2e): traffic route test with default tr policy (#11523)) _ = Describe("Traffic Route", trafficroute.TrafficRoute, Ordered) _ = Describe("Zone Egress", zoneegress.ExternalServices, Ordered) _ = Describe("Virtual Outbound", virtualoutbound.VirtualOutbound, Ordered) From 2fa2d123aa7d9e5f20eed71e31355582a63e945b Mon Sep 17 00:00:00 2001 From: Marcin Skalski Date: Thu, 3 Oct 2024 11:45:09 +0200 Subject: [PATCH 3/3] chore(backport): fix missing method Signed-off-by: Marcin Skalski --- test/framework/setup.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/test/framework/setup.go b/test/framework/setup.go index af6e93aa227d..7494223bacf0 100644 --- a/test/framework/setup.go +++ b/test/framework/setup.go @@ -196,6 +196,25 @@ func Kuma(mode core.CpMode, opt ...KumaDeploymentOption) InstallFunc { } } +func TrafficRouteUniversal(name string) InstallFunc { + tr := fmt.Sprintf(` +type: TrafficRoute +name: route-all-%[1]s +mesh: %[1]s +sources: + - match: + kuma.io/service: '*' +destinations: + - match: + kuma.io/service: '*' +conf: + loadBalancer: + roundRobin: {} + destination: + kuma.io/service: '*'`, name) + return YamlUniversal(tr) +} + func WaitService(namespace, service string) InstallFunc { return func(c Cluster) error { k8s.WaitUntilServiceAvailable(c.GetTesting(), c.GetKubectlOptions(namespace), service, 10, 3*time.Second)