From 59507276ca401cc88ccaa31e6dbf61ae40391329 Mon Sep 17 00:00:00 2001 From: Marcin Skalski Date: Wed, 9 Oct 2024 18:30:58 +0200 Subject: [PATCH 1/3] fix(e2e): port forward to service instead of pod of kuma-cp to improve test stability (#11737) * fix(ci): port forward to service instead of pod of kuma-cp to improve test stability Signed-off-by: Marcin Skalski --------- Signed-off-by: Marcin Skalski --- test/framework/k8s_controlplane.go | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/test/framework/k8s_controlplane.go b/test/framework/k8s_controlplane.go index 44409b3d84b3..1520be2922b8 100644 --- a/test/framework/k8s_controlplane.go +++ b/test/framework/k8s_controlplane.go @@ -78,6 +78,7 @@ func (c *K8sControlPlane) GetKubectlOptions(namespace ...string) *k8s.KubectlOpt } func (c *K8sControlPlane) PortForwardKumaCP() { +<<<<<<< HEAD kumaCpPods := c.GetKumaCPPods() // There could be multiple pods still starting so pick one that's available already for i := range kumaCpPods { @@ -87,8 +88,21 @@ func (c *K8sControlPlane) PortForwardKumaCP() { c.portFwd.ApiServerEndpoint = c.portFwd.apiServerTunnel.Endpoint() return } +======= + kumaCpSvc := c.GetKumaCPSvc() + if k8s.IsServiceAvailable(&kumaCpSvc) { + c.portFwd.apiServerTunnel = k8s.NewTunnel(c.GetKubectlOptions(Config.KumaNamespace), k8s.ResourceTypeService, kumaCpSvc.Name, 0, 5681) + c.portFwd.apiServerTunnel.ForwardPort(c.t) + c.portFwd.ApiServerEndpoint = c.portFwd.apiServerTunnel.Endpoint() + + c.madsFwd.apiServerTunnel = k8s.NewTunnel(c.GetKubectlOptions(Config.KumaNamespace), k8s.ResourceTypeService, kumaCpSvc.Name, 0, 5676) + c.madsFwd.apiServerTunnel.ForwardPort(c.t) + c.madsFwd.ApiServerEndpoint = c.madsFwd.apiServerTunnel.Endpoint() + return +>>>>>>> 7129c9496 (fix(e2e): port forward to service instead of pod of kuma-cp to improve test stability (#11737)) } - c.t.Fatalf("Failed finding an available pod, allPods: %v", kumaCpPods) + + c.t.Fatalf("Failed finding an available service, service: %v", kumaCpSvc) } func (c *K8sControlPlane) ClosePortForwards() { From 7f839a504a02a88d029452352b7cf614a63878e9 Mon Sep 17 00:00:00 2001 From: Marcin Skalski Date: Wed, 9 Oct 2024 18:46:05 +0200 Subject: [PATCH 2/3] chore(backport): fix conflict Signed-off-by: Marcin Skalski --- test/framework/k8s_controlplane.go | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/test/framework/k8s_controlplane.go b/test/framework/k8s_controlplane.go index 1520be2922b8..6791ce8f4073 100644 --- a/test/framework/k8s_controlplane.go +++ b/test/framework/k8s_controlplane.go @@ -78,28 +78,11 @@ func (c *K8sControlPlane) GetKubectlOptions(namespace ...string) *k8s.KubectlOpt } func (c *K8sControlPlane) PortForwardKumaCP() { -<<<<<<< HEAD - kumaCpPods := c.GetKumaCPPods() - // There could be multiple pods still starting so pick one that's available already - for i := range kumaCpPods { - if k8s.IsPodAvailable(&kumaCpPods[i]) { - c.portFwd.apiServerTunnel = k8s.NewTunnel(c.GetKubectlOptions(Config.KumaNamespace), k8s.ResourceTypePod, kumaCpPods[i].Name, 0, 5681) - c.portFwd.apiServerTunnel.ForwardPort(c.t) - c.portFwd.ApiServerEndpoint = c.portFwd.apiServerTunnel.Endpoint() - return - } -======= kumaCpSvc := c.GetKumaCPSvc() if k8s.IsServiceAvailable(&kumaCpSvc) { c.portFwd.apiServerTunnel = k8s.NewTunnel(c.GetKubectlOptions(Config.KumaNamespace), k8s.ResourceTypeService, kumaCpSvc.Name, 0, 5681) c.portFwd.apiServerTunnel.ForwardPort(c.t) c.portFwd.ApiServerEndpoint = c.portFwd.apiServerTunnel.Endpoint() - - c.madsFwd.apiServerTunnel = k8s.NewTunnel(c.GetKubectlOptions(Config.KumaNamespace), k8s.ResourceTypeService, kumaCpSvc.Name, 0, 5676) - c.madsFwd.apiServerTunnel.ForwardPort(c.t) - c.madsFwd.ApiServerEndpoint = c.madsFwd.apiServerTunnel.Endpoint() - return ->>>>>>> 7129c9496 (fix(e2e): port forward to service instead of pod of kuma-cp to improve test stability (#11737)) } c.t.Fatalf("Failed finding an available service, service: %v", kumaCpSvc) From 20e0df3efd9115cf6e3b3acd384814bd0f827c24 Mon Sep 17 00:00:00 2001 From: Marcin Skalski Date: Thu, 10 Oct 2024 08:48:42 +0200 Subject: [PATCH 3/3] chore(backport): fix conflict Signed-off-by: Marcin Skalski --- test/framework/k8s_controlplane.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/framework/k8s_controlplane.go b/test/framework/k8s_controlplane.go index 6791ce8f4073..48daf0890986 100644 --- a/test/framework/k8s_controlplane.go +++ b/test/framework/k8s_controlplane.go @@ -83,6 +83,7 @@ func (c *K8sControlPlane) PortForwardKumaCP() { c.portFwd.apiServerTunnel = k8s.NewTunnel(c.GetKubectlOptions(Config.KumaNamespace), k8s.ResourceTypeService, kumaCpSvc.Name, 0, 5681) c.portFwd.apiServerTunnel.ForwardPort(c.t) c.portFwd.ApiServerEndpoint = c.portFwd.apiServerTunnel.Endpoint() + return } c.t.Fatalf("Failed finding an available service, service: %v", kumaCpSvc)