github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-08-20 08:03:21 +00:00
Code Issues Projects Releases Wiki Activity

client-go, kubectl: Replace deprecated ErrWaitTimeout with recommended method (#132718)

Browse Source 
* client-go: Replace depracted ErrWaitTimeout with recommended method

* Fix UT and Integration tests

* IT test

Kubernetes-commit: ffe306d67958297202e9492ea644b42c0e7e694d
This commit is contained in:
Mayuka Channankaiah 2025-07-24 20:26:27 +05:30 committed by Kubernetes Publisher
parent 764374b324
commit 753cfe1811
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/watch/retrywatcher_test.go
View File

@ -595,7 +595,7 @@ func TestRetryWatcher(t *testing.T) {
counter = atomic.LoadUint32(atomicCounter) counter = atomic.LoadUint32(atomicCounter)
return counter == tc.watchCount, nil return counter == tc.watchCount, nil
}) })
if err == wait.ErrWaitTimeout { if wait.Interrupted(err) {
t.Errorf("expected %d watcher starts, but it has started %d times", tc.watchCount, counter) t.Errorf("expected %d watcher starts, but it has started %d times", tc.watchCount, counter)
} else if err != nil { } else if err != nil {
t.Fatal(err) t.Fatal(err)

2
tools/watch/until.go
View File

@ -86,7 +86,7 @@ func UntilWithoutRetry(ctx context.Context, watcher watch.Interface, conditions
} }
case <-ctx.Done(): case <-ctx.Done():
return lastEvent, wait.ErrWaitTimeout return lastEvent, wait.ErrorInterrupted(nil)
} }
} }
} }

4
tools/watch/until_test.go
View File

@ -116,7 +116,7 @@ func TestUntilMultipleConditionsFail(t *testing.T) {
defer cancel() defer cancel()
lastEvent, err := UntilWithoutRetry(ctx, fw, conditions...) lastEvent, err := UntilWithoutRetry(ctx, fw, conditions...)
if err != wait.ErrWaitTimeout { if !wait.Interrupted(err) {
t.Fatalf("expected ErrWaitTimeout error, got %#v", err) t.Fatalf("expected ErrWaitTimeout error, got %#v", err)
} }
if lastEvent == nil { if lastEvent == nil {
@ -209,7 +209,7 @@ func TestUntilWithSync(t *testing.T) {
conditionFunc: func(e watch.Event) (bool, error) { conditionFunc: func(e watch.Event) (bool, error) {
return true, nil return true, nil
}, },
expectedErr: wait.ErrWaitTimeout, expectedErr: wait.ErrorInterrupted(nil),
expectedEvent: nil, expectedEvent: nil,
}, },
{ {

8
util/certificate/csr/csr.go
View File

@ -202,7 +202,7 @@ func WaitForCertificate(ctx context.Context, client clientset.Interface, reqName
// return if we've timed out // return if we've timed out
if err := ctx.Err(); err != nil { if err := ctx.Err(); err != nil {
return nil, wait.ErrWaitTimeout return nil, wait.ErrorInterrupted(nil)
} }
// see if the v1beta1 API is available // see if the v1beta1 API is available
@ -226,7 +226,7 @@ func WaitForCertificate(ctx context.Context, client clientset.Interface, reqName
// return if we've timed out // return if we've timed out
if err := ctx.Err(); err != nil { if err := ctx.Err(); err != nil {
return nil, wait.ErrWaitTimeout return nil, wait.ErrorInterrupted(nil)
} }
// wait and try again // wait and try again
@ -306,8 +306,8 @@ func WaitForCertificate(ctx context.Context, client clientset.Interface, reqName
return false, nil return false, nil
}, },
) )
if err == wait.ErrWaitTimeout { if wait.Interrupted(err) {
return nil, wait.ErrWaitTimeout return nil, wait.ErrorInterrupted(nil)
} }
if err != nil { if err != nil {
return nil, formatError("cannot watch on the certificate signing request: %v", err) return nil, formatError("cannot watch on the certificate signing request: %v", err)

2
util/retry/util.go
View File

@ -59,7 +59,7 @@ func OnError(backoff wait.Backoff, retriable func(error) bool, fn func() error)
return false, err return false, err
} }
}) })
if err == wait.ErrWaitTimeout { if wait.Interrupted(err) {
err = lastErr err = lastErr
} }
return err return err

2
util/workqueue/delaying_queue_test.go
View File

@ -60,7 +60,7 @@ func TestSimpleQueue(t *testing.T) {
return false, nil return false, nil
}) })
if err != wait.ErrWaitTimeout { if !wait.Interrupted(err) {
t.Errorf("expected timeout, got: %v", err) t.Errorf("expected timeout, got: %v", err)
} }