Skip to content

Commit 64c099d

Browse files
deads2kdeads2k
committed
remove secondary client retries in e2e tests
1 parent 4bbf411 commit 64c099d

File tree

21 files changed

+8
-141
lines changed

21 files changed

+8
-141
lines changed

‎test/e2e/apps/daemon_set.go‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import (
2323
"strings"
2424
"time"
2525

26+
"github.com/onsi/ginkgo"
27+
"github.com/onsi/gomega"
2628
appsv1 "k8s.io/api/apps/v1"
2729
v1 "k8s.io/api/core/v1"
2830
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -39,10 +41,6 @@ import (
3941
"k8s.io/kubernetes/test/e2e/framework"
4042
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
4143
e2eresource "k8s.io/kubernetes/test/e2e/framework/resource"
42-
testutils "k8s.io/kubernetes/test/utils"
43-
44-
"github.com/onsi/ginkgo"
45-
"github.com/onsi/gomega"
4644
)
4745

4846
const (
@@ -69,9 +67,6 @@ func updateDaemonSetWithRetries(c clientset.Interface, namespace, name string, a
6967
var updateErr error
7068
pollErr := wait.PollImmediate(10*time.Millisecond, 1*time.Minute, func() (bool, error) {
7169
if ds, err = daemonsets.Get(context.TODO(), name, metav1.GetOptions{}); err != nil {
72-
if testutils.IsRetryableAPIError(err) {
73-
return false, nil
74-
}
7570
return false, err
7671
}
7772
// Apply the update, then attempt to push it to the apiserver.

‎test/e2e/cloud/gcp/addon_update.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import (
3434
e2enetwork "k8s.io/kubernetes/test/e2e/framework/network"
3535
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3636
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
37-
testutils "k8s.io/kubernetes/test/utils"
3837
imageutils "k8s.io/kubernetes/test/utils/image"
3938

4039
"github.com/onsi/ginkgo"
@@ -391,7 +390,7 @@ func waitForServiceWithSelector(c clientset.Interface, namespace string, selecto
391390
case len(services.Items) == 0:
392391
framework.Logf("Service with %s in namespace %s disappeared.", selector.String(), namespace)
393392
return !exist, nil
394-
case !testutils.IsRetryableAPIError(err):
393+
case err != nil:
395394
framework.Logf("Non-retryable failure while listing service.")
396395
return false, err
397396
default:

‎test/e2e/e2e.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,6 @@ func waitForDaemonSets(c clientset.Interface, ns string, allowedNotReadyNodes in
193193
dsList, err := c.AppsV1().DaemonSets(ns).List(context.TODO(), metav1.ListOptions{})
194194
if err != nil {
195195
framework.Logf("Error getting daemonsets in namespace: '%s': %v", ns, err)
196-
if testutils.IsRetryableAPIError(err) {
197-
return false, nil
198-
}
199196
return false, err
200197
}
201198
var notReadyDaemonSets []string

‎test/e2e/framework/ingress/ingress_utils.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -732,9 +732,6 @@ func (j *TestJig) WaitForIngressAddress(c clientset.Interface, ns, ingName strin
732732
ipOrNameList, err := getIngressAddress(c, ns, ingName, j.Class)
733733
if err != nil || len(ipOrNameList) == 0 {
734734
j.Logger.Errorf("Waiting for Ingress %s/%s to acquire IP, error: %v, ipOrNameList: %v", ns, ingName, err, ipOrNameList)
735-
if testutils.IsRetryableAPIError(err) {
736-
return false, nil
737-
}
738735
return false, err
739736
}
740737
address = ipOrNameList[0]
@@ -892,9 +889,6 @@ func getPortURL(client clientset.Interface, ns, name string, svcPort int) (strin
892889
"spec.unschedulable": "false",
893890
}.AsSelector().String()})
894891
if err != nil {
895-
if testutils.IsRetryableAPIError(err) {
896-
return false, nil
897-
}
898892
return false, err
899893
}
900894
return true, nil

‎test/e2e/framework/network/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ go_library(
2222
"//test/e2e/framework/pod:go_default_library",
2323
"//test/e2e/framework/skipper:go_default_library",
2424
"//test/e2e/framework/ssh:go_default_library",
25-
"//test/utils:go_default_library",
2625
"//test/utils/image:go_default_library",
2726
"//vendor/github.com/onsi/ginkgo:go_default_library",
2827
],

‎test/e2e/framework/network/utils.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import (
4444
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
4545
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
4646
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
47-
testutils "k8s.io/kubernetes/test/utils"
4847
imageutils "k8s.io/kubernetes/test/utils/image"
4948
)
5049

@@ -1050,7 +1049,7 @@ func WaitForService(c clientset.Interface, namespace, name string, exist bool, i
10501049
case apierrors.IsNotFound(err):
10511050
framework.Logf("Service %s in namespace %s disappeared.", name, namespace)
10521051
return !exist, nil
1053-
case !testutils.IsRetryableAPIError(err):
1052+
case err != nil:
10541053
framework.Logf("Non-retryable failure while getting service.")
10551054
return false, err
10561055
default:

‎test/e2e/framework/node/BUILD‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ go_library(
2424
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
2525
"//staging/src/k8s.io/client-go/util/retry:go_default_library",
2626
"//test/e2e/framework/log:go_default_library",
27-
"//test/utils:go_default_library",
2827
"//test/utils/image:go_default_library",
2928
"//vendor/github.com/onsi/ginkgo:go_default_library",
3029
"//vendor/github.com/onsi/gomega:go_default_library",
@@ -38,7 +37,6 @@ go_test(
3837
embed = [":go_default_library"],
3938
deps = [
4039
"//staging/src/k8s.io/api/core/v1:go_default_library",
41-
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
4240
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
4341
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
4442
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",

‎test/e2e/framework/node/wait.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"k8s.io/apimachinery/pkg/util/wait"
2929
clientset "k8s.io/client-go/kubernetes"
3030
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
31-
testutils "k8s.io/kubernetes/test/utils"
3231
)
3332

3433
const sleepTime = 20 * time.Second
@@ -57,9 +56,6 @@ func WaitForTotalHealthy(c clientset.Interface, timeout time.Duration) error {
5756
// It should be OK to list unschedulable Nodes here.
5857
nodes, err := c.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{ResourceVersion: "0"})
5958
if err != nil {
60-
if testutils.IsRetryableAPIError(err) {
61-
return false, nil
62-
}
6359
return false, err
6460
}
6561
for _, node := range nodes.Items {
@@ -184,9 +180,6 @@ func waitListSchedulableNodes(c clientset.Interface) (*v1.NodeList, error) {
184180
"spec.unschedulable": "false",
185181
}.AsSelector().String()})
186182
if err != nil {
187-
if testutils.IsRetryableAPIError(err) {
188-
return false, nil
189-
}
190183
return false, err
191184
}
192185
return true, nil
@@ -219,9 +212,6 @@ func CheckReadyForTests(c clientset.Interface, nonblockingTaints string, allowed
219212
allNodes, err := c.CoreV1().Nodes().List(context.TODO(), opts)
220213
if err != nil {
221214
e2elog.Logf("Unexpected error listing nodes: %v", err)
222-
if testutils.IsRetryableAPIError(err) {
223-
return false, nil
224-
}
225215
return false, err
226216
}
227217
for _, node := range allNodes.Items {

‎test/e2e/framework/node/wait_test.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"testing"
2222

2323
v1 "k8s.io/api/core/v1"
24-
apierrors "k8s.io/apimachinery/pkg/api/errors"
2524
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2625
"k8s.io/apimachinery/pkg/runtime"
2726
"k8s.io/client-go/kubernetes/fake"
@@ -155,10 +154,6 @@ func TestCheckReadyForTests(t *testing.T) {
155154
nodeListErr: errors.New("Forced error"),
156155
expected: false,
157156
expectedErr: "Forced error",
158-
}, {
159-
desc: "Retryable errors from node list are reported but still return false",
160-
nodeListErr: apierrors.NewTimeoutError("Retryable error", 10),
161-
expected: false,
162157
},
163158
}
164159

‎test/e2e/framework/pod/resource.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,9 +476,6 @@ func CreateExecPodOrFail(client clientset.Interface, ns, generateName string, tw
476476
err = wait.PollImmediate(poll, 5*time.Minute, func() (bool, error) {
477477
retrievedPod, err := client.CoreV1().Pods(execPod.Namespace).Get(context.TODO(), execPod.Name, metav1.GetOptions{})
478478
if err != nil {
479-
if testutils.IsRetryableAPIError(err) {
480-
return false, nil
481-
}
482479
return false, err
483480
}
484481
return retrievedPod.Status.Phase == v1.PodRunning, nil

0 commit comments

Comments
 (0)