mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-12 17:30:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: use k8sVersionGreaterEquals() for cephfs tests

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-10-14 11:00:25 +02:00 committed by mergify[bot]
parent d26030ca5f
commit cfddc9f887
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
e2e/cephfs.go
View File

@ -425,13 +425,8 @@ var _ = Describe("cephfs", func() {
}) })
By("Resize PVC and check application directory size", func() { By("Resize PVC and check application directory size", func() {
v, err := f.ClientSet.Discovery().ServerVersion()
if err != nil {
e2elog.Failf("failed to get server version with error with error %v", err)
}
// Resize 0.3.0 is only supported from v1.15+ // Resize 0.3.0 is only supported from v1.15+
if v.Major > "1" || (v.Major == "1" && v.Minor >= "15") { if k8sVersionGreaterEquals(f.ClientSet, 1, 15) {
err := resizePVCAndValidateSize(pvcPath, appPath, f) err := resizePVCAndValidateSize(pvcPath, appPath, f)
if err != nil { if err != nil {
e2elog.Failf("failed to resize PVC with error %v", err) e2elog.Failf("failed to resize PVC with error %v", err)
@ -483,19 +478,15 @@ var _ = Describe("cephfs", func() {
}) })
By("create a PVC clone and bind it to an app", func() { By("create a PVC clone and bind it to an app", func() {
v, err := f.ClientSet.Discovery().ServerVersion()
if err != nil {
e2elog.Failf("failed to get server version with error with error %v", err)
}
// snapshot beta is only supported from v1.17+ // snapshot beta is only supported from v1.17+
if v.Major > "1" || (v.Major == "1" && v.Minor >= "17") { if k8sVersionGreaterEquals(f.ClientSet, 1, 17) {
var wg sync.WaitGroup var wg sync.WaitGroup
totalCount := 3 totalCount := 3
// totalSubvolumes represents the subvolumes in backend // totalSubvolumes represents the subvolumes in backend
// always totalCount+parentPVC // always totalCount+parentPVC
totalSubvolumes := totalCount + 1 totalSubvolumes := totalCount + 1
wg.Add(totalCount) wg.Add(totalCount)
err = createCephFSSnapshotClass(f) err := createCephFSSnapshotClass(f)
if err != nil { if err != nil {
e2elog.Failf("failed to delete CephFS storageclass with error %v", err) e2elog.Failf("failed to delete CephFS storageclass with error %v", err)
} }
@ -643,12 +634,8 @@ var _ = Describe("cephfs", func() {
}) })
By("create a PVC-PVC clone and bind it to an app", func() { By("create a PVC-PVC clone and bind it to an app", func() {
v, err := f.ClientSet.Discovery().ServerVersion()
if err != nil {
e2elog.Failf("failed to get server version with error with error %v", err)
}
// pvc clone is only supported from v1.16+ // pvc clone is only supported from v1.16+
if v.Major > "1" || (v.Major == "1" && v.Minor >= "16") { if k8sVersionGreaterEquals(f.ClientSet, 1, 16) {
var wg sync.WaitGroup var wg sync.WaitGroup
totalCount := 3 totalCount := 3
// totalSubvolumes represents the subvolumes in backend // totalSubvolumes represents the subvolumes in backend