mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-09 16:00:22 +00:00
cleanup: ErrWaitTimeout is deprecated in k8s 1.27
replaced ErrWaitTimeout with Interrupted Signed-off-by: riya-singhal31 <rsinghal@redhat.com>
This commit is contained in:
parent
6709cdd1d0
commit
92d9785166
@ -18,7 +18,6 @@ package e2e
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"time"
|
||||
@ -175,7 +174,7 @@ func waitForDeploymentComplete(clientSet kubernetes.Interface, name, ns string,
|
||||
return false, nil
|
||||
})
|
||||
|
||||
if errors.Is(err, wait.ErrWaitTimeout) {
|
||||
if wait.Interrupted(err) {
|
||||
err = fmt.Errorf("%s", reason)
|
||||
}
|
||||
if err != nil {
|
||||
|
@ -18,7 +18,6 @@ package e2e
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
@ -1913,7 +1912,7 @@ var _ = Describe("RBD", func() {
|
||||
return true, nil
|
||||
})
|
||||
|
||||
if errors.Is(err, wait.ErrWaitTimeout) {
|
||||
if wait.Interrupted(err) {
|
||||
framework.Failf("timed out waiting for the rbd-nbd process: %s", reason)
|
||||
}
|
||||
if err != nil {
|
||||
|
@ -19,7 +19,6 @@ package e2e
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
@ -1052,7 +1051,7 @@ func waitToRemoveImagesFromTrash(f *framework.Framework, poolName string, t int)
|
||||
return false, nil
|
||||
})
|
||||
|
||||
if errors.Is(err, wait.ErrWaitTimeout) {
|
||||
if wait.Interrupted(err) {
|
||||
err = errReason
|
||||
}
|
||||
|
||||
|
@ -19,7 +19,6 @@ package rbd
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"strconv"
|
||||
@ -509,7 +508,7 @@ func waitForrbdImage(ctx context.Context, backoff wait.Backoff, volOptions *rbdV
|
||||
return !used, nil
|
||||
})
|
||||
// return error if rbd image has not become available for the specified timeout
|
||||
if errors.Is(err, wait.ErrWaitTimeout) {
|
||||
if wait.Interrupted(err) {
|
||||
return fmt.Errorf("rbd image %s is still being used", imagePath)
|
||||
}
|
||||
// return error if any other errors were encountered during waiting for the image to become available
|
||||
|
Loading…
Reference in New Issue
Block a user