mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 10:33:35 +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

15
e2e/resize.go
View File

@ -15,7 +15,6 @@ import (
"k8s.io/cloud-provider/volume/helpers"
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
testutils "k8s.io/kubernetes/test/utils"
)
func expandPVCSize(c kubernetes.Interface, pvc *v1.PersistentVolumeClaim, size string, t int) error {
@ -40,7 +39,7 @@ func expandPVCSize(c kubernetes.Interface, pvc *v1.PersistentVolumeClaim, size s
updatedPVC, err = c.CoreV1().PersistentVolumeClaims(updatedPVC.Namespace).Get(context.TODO(), pvcName, metav1.GetOptions{})
if err != nil {
e2elog.Logf("Error getting pvc in namespace: '%s': %v", updatedPVC.Namespace, err)
if testutils.IsRetryableAPIError(err) {
if isRetryableAPIError(err) {
return false, nil
}
return false, err
@ -170,11 +169,15 @@ func checkAppMntSize(f *framework.Framework, opt *metav1.ListOptions, size, cmd,
return false, nil
}
s := resource.MustParse(strings.TrimSpace(output))
actualSize := helpers.RoundUpToGiB(s)
actualSize, err := helpers.RoundUpToGiB(s)
if err != nil {
return false, err
}
s = resource.MustParse(size)
expectedSize := helpers.RoundUpToGiB(s)
expectedSize, err := helpers.RoundUpToGiB(s)
if err != nil {
return false, err
}
if actualSize != expectedSize {
e2elog.Logf("expected size %s found %s information", size, output)
return false, nil