diff --git a/test/e2e/apimachinery/crd_conversion_webhook.go b/test/e2e/apimachinery/crd_conversion_webhook.go index b1e359e1bf7..110b6b8e5a7 100644 --- a/test/e2e/apimachinery/crd_conversion_webhook.go +++ b/test/e2e/apimachinery/crd_conversion_webhook.go @@ -36,6 +36,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment" + e2eendpointslice "k8s.io/kubernetes/test/e2e/framework/endpointslice" "k8s.io/kubernetes/test/utils/crd" "k8s.io/kubernetes/test/utils/format" imageutils "k8s.io/kubernetes/test/utils/image" @@ -340,7 +341,7 @@ func deployCustomResourceWebhookAndService(ctx context.Context, f *framework.Fra framework.ExpectNoError(err, "creating service %s in namespace %s", serviceCRDName, namespace) ginkgo.By("Verifying the service has paired with the endpoint") - err = framework.WaitForServiceEndpointsNum(ctx, client, namespace, serviceCRDName, 1, 1*time.Second, 30*time.Second) + err = e2eendpointslice.WaitForEndpointCount(ctx, client, namespace, serviceCRDName, 1) framework.ExpectNoError(err, "waiting for service %s/%s have %d endpoint", namespace, serviceCRDName, 1) } diff --git a/test/e2e/apimachinery/webhook.go b/test/e2e/apimachinery/webhook.go index ae2734a9269..37e301e8a41 100644 --- a/test/e2e/apimachinery/webhook.go +++ b/test/e2e/apimachinery/webhook.go @@ -42,6 +42,7 @@ import ( "k8s.io/client-go/util/retry" "k8s.io/kubernetes/test/e2e/framework" e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment" + e2eendpointslice "k8s.io/kubernetes/test/e2e/framework/endpointslice" e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" "k8s.io/kubernetes/test/utils/crd" @@ -1147,7 +1148,7 @@ func deployWebhookAndService(ctx context.Context, f *framework.Framework, image framework.ExpectNoError(err, "creating service %s in namespace %s", serviceName, namespace) ginkgo.By("Verifying the service has paired with the endpoint") - err = framework.WaitForServiceEndpointsNum(ctx, client, namespace, serviceName, 1, 1*time.Second, 30*time.Second) + err = e2eendpointslice.WaitForEndpointCount(ctx, client, namespace, serviceName, 1) framework.ExpectNoError(err, "waiting for service %s/%s have %d endpoint", namespace, serviceName, 1) }