upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-08 16:30:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some linter errors before splitting out code

Browse source 
(In particular, fix the wait.PollImmediate calls even in the code
that's staying here, not just the code that's moving.)
This commit is contained in:
Dan Winship 2025-09-10 10:23:07 -04:00
parent 07959fd168
commit d46f15bd12
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/e2e/network/endpointslice.go
View file

@ -117,7 +117,7 @@ var _ = common.SIGDescribe("EndpointSlice", func() {
framework.ExpectNoError(err, "error creating Service")
// Expect Endpoints resource to be created.
if err := wait.PollImmediate(2*time.Second, wait.ForeverTestTimeout, func() (bool, error) {
if err := wait.PollUntilContextTimeout(ctx, 2*time.Second, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) {
_, err := cs.CoreV1().Endpoints(svc.Namespace).Get(ctx, svc.Name, metav1.GetOptions{})
if err != nil {
return false, nil
@ -129,7 +129,7 @@ var _ = common.SIGDescribe("EndpointSlice", func() {
// Expect EndpointSlice resource to be created.
var endpointSlice discoveryv1.EndpointSlice
if err := wait.PollImmediate(2*time.Second, wait.ForeverTestTimeout, func() (bool, error) {
if err := wait.PollUntilContextTimeout(ctx, 2*time.Second, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) {
endpointSliceList, err := cs.DiscoveryV1().EndpointSlices(svc.Namespace).List(ctx, metav1.ListOptions{
LabelSelector: "kubernetes.io/service-name=" + svc.Name,
})
@ -161,7 +161,7 @@ var _ = common.SIGDescribe("EndpointSlice", func() {
framework.ExpectNoError(err, "error deleting Service")
// Expect Endpoints resource to be deleted when Service is.
if err := wait.PollImmediate(2*time.Second, wait.ForeverTestTimeout, func() (bool, error) {
if err := wait.PollUntilContextTimeout(ctx, 2*time.Second, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) {
_, err := cs.CoreV1().Endpoints(svc.Namespace).Get(ctx, svc.Name, metav1.GetOptions{})
if err != nil {
if apierrors.IsNotFound(err) {
@ -178,7 +178,7 @@ var _ = common.SIGDescribe("EndpointSlice", func() {
// up to 90 seconds since garbage collector only polls every 30 seconds
// and may need to retry informer resync at some point during an e2e
// run.
if err := wait.PollImmediate(2*time.Second, 90*time.Second, func() (bool, error) {
if err := wait.PollUntilContextTimeout(ctx, 2*time.Second, 90*time.Second, true, func(ctx context.Context) (bool, error) {
endpointSliceList, err := cs.DiscoveryV1().EndpointSlices(svc.Namespace).List(ctx, metav1.ListOptions{
LabelSelector: "kubernetes.io/service-name=" + svc.Name,
})
@ -787,7 +787,9 @@ func expectEndpointsAndSlices(ctx context.Context, cs clientset.Interface, ns st
totalEndpointAddresses := 0
for _, subset := range endpoints.Subsets {
addresses := append(subset.Addresses, subset.NotReadyAddresses...)
addresses := []v1.EndpointAddress{}
addresses = append(addresses, subset.Addresses...)
addresses = append(addresses, subset.NotReadyAddresses...)
totalEndpointAddresses += len(addresses)
if len(subset.Ports) != len(svc.Spec.Ports) {