From 8eb31f8aa16eaac8c4f1c1722a829b22b46ebc73 Mon Sep 17 00:00:00 2001 From: carlory Date: Wed, 8 Jan 2025 19:35:41 +0800 Subject: [PATCH] Fix service's nodePort already allocated Signed-off-by: carlory --- test/e2e/network/service.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/e2e/network/service.go b/test/e2e/network/service.go index 023ed729cd2..5a5491f08c7 100644 --- a/test/e2e/network/service.go +++ b/test/e2e/network/service.go @@ -1703,7 +1703,7 @@ var _ = common.SIGDescribe("Services", func() { } break } - if apierrors.IsConflict(err) { + if apierrors.IsInvalid(err) { framework.Logf("node port %d is already allocated to other service, retrying ... : %v", port, err) continue } @@ -3979,7 +3979,7 @@ var _ = common.SIGDescribe("Services", func() { } break } - if apierrors.IsConflict(err) { + if apierrors.IsInvalid(err) { framework.Logf("node port %d is already allocated to other service, retrying ... : %v", port, err) continue } @@ -3987,7 +3987,12 @@ var _ = common.SIGDescribe("Services", func() { } - defer e2eservice.ReleaseStaticNodePort(svc.Spec.HealthCheckNodePort) + ginkgo.DeferCleanup(func(ctx context.Context) { + err := cs.CoreV1().Services(namespace).Delete(ctx, serviceName, metav1.DeleteOptions{}) + framework.ExpectNoError(err, "failed to delete service: %s in namespace: %s", serviceName, namespace) + e2eservice.ReleaseStaticNodePort(svc.Spec.HealthCheckNodePort) + }) + nodePortStr := fmt.Sprintf("%d", svc.Spec.Ports[0].NodePort) hcNodePortStr := fmt.Sprintf("%d", svc.Spec.HealthCheckNodePort) framework.Logf("NodePort is %s, HealthCheckNodePort is %s", nodePortStr, hcNodePortStr)