fix(e2e): port forward to service instead of pod of kuma-cp to improv…

…e test stability (#11737) * fix(ci): port forward to service instead of pod of kuma-cp to improve test stability Signed-off-by: Marcin Skalski <[email protected]> --------- Signed-off-by: Marcin Skalski <[email protected]>
kumahq · Oct 9, 2024 · 5950727 · 5950727
1 parent b9b5d5d
commit 5950727
Showing 1 changed file with 15 additions and 1 deletion.
diff --git 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() {