mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-14 02:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: IsRetryableAPIError is not available in kubernetes 1.20.0

Browse Source 
IsRetryableAPIError is not available in latest
kubernetes release ie 1.20.0 created a internal
function called isRetryableAPIError for the same.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna
2020-12-17 18:30:02 +05:30
committed by mergify[bot]
parent 83559144b1
commit 1db3f03856
6 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e2e/pod.go
View File

@ -16,7 +16,6 @@ import (
"k8s.io/kubernetes/pkg/client/conditions"
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
testutils "k8s.io/kubernetes/test/utils"
)
func waitForDaemonSets(name, ns string, c kubernetes.Interface, t int) error {
@ -31,7 +30,7 @@ func waitForDaemonSets(name, ns string, c kubernetes.Interface, t int) error {
if strings.Contains(err.Error(), "not found") {
return false, nil
}
if testutils.IsRetryableAPIError(err) {
if isRetryableAPIError(err) {
return false, nil
}
return false, err
@ -60,7 +59,7 @@ func waitForDeploymentComplete(name, ns string, c kubernetes.Interface, t int) e
deployment, err = c.AppsV1().Deployments(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
// a StatusError is not marked as 'retryable', but we want to retry anyway
if testutils.IsRetryableAPIError(err) || strings.Contains(err.Error(), "etcdserver: request timed out") {
if isRetryableAPIError(err) || strings.Contains(err.Error(), "etcdserver: request timed out") {
// hide API-server timeouts, so that PollImmediate() retries
e2elog.Logf("deployment error: %v", err)
return false, nil