From 38b86fd97ed903bed89e231dfdf0415edd257bc7 Mon Sep 17 00:00:00 2001 From: hello2mao Date: Mon, 28 Jan 2019 21:55:09 +0800 Subject: [PATCH 1/2] reduce hard code to avoid more mistakes --- test/e2e/framework/service_util.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/e2e/framework/service_util.go b/test/e2e/framework/service_util.go index 394958d0f68..628d309253a 100644 --- a/test/e2e/framework/service_util.go +++ b/test/e2e/framework/service_util.go @@ -40,6 +40,7 @@ import ( "k8s.io/client-go/util/retry" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" + "k8s.io/kubernetes/pkg/registry/core/service/portallocator" testutils "k8s.io/kubernetes/test/utils" imageutils "k8s.io/kubernetes/test/utils/image" @@ -557,7 +558,7 @@ func (j *ServiceTestJig) ChangeServiceNodePortOrFail(namespace, name string, ini service, err = j.UpdateService(namespace, name, func(s *v1.Service) { s.Spec.Ports[0].NodePort = int32(newPort) }) - if err != nil && strings.Contains(err.Error(), "provided port is already allocated") { + if err != nil && strings.Contains(err.Error(), portallocator.ErrAllocated.Error()) { Logf("tried nodePort %d, but it is in use, will try another", newPort) continue } From 7371c40abe907d377df78b6e7d8dbbfdb97c5c2c Mon Sep 17 00:00:00 2001 From: hello2mao Date: Wed, 30 Jan 2019 09:45:06 +0800 Subject: [PATCH 2/2] update the BUILD file --- test/e2e/framework/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index ab4868a01d5..52b959e4aa7 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -64,6 +64,7 @@ go_library( "//pkg/kubelet/sysctl:go_default_library", "//pkg/kubelet/util/format:go_default_library", "//pkg/master/ports:go_default_library", + "//pkg/registry/core/service/portallocator:go_default_library", "//pkg/scheduler/algorithm/predicates:go_default_library", "//pkg/scheduler/metrics:go_default_library", "//pkg/scheduler/nodeinfo:go_default_library",