github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-21 17:15:35 +00:00
Code Issues Projects Releases Wiki Activity

Replace deprecated WaitForServiceEndpointsNum

Browse Source 
with WaitForEndpointCount
This commit is contained in:
Adrian Moisey
2025-07-30 21:51:08 +02:00
parent 032142c53e
commit 531fdc67e2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/apimachinery/crd_conversion_webhook.go
View File

@@ -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)
}

3
test/e2e/apimachinery/webhook.go
View File

@@ -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)
}