e2e: remove 1.15 based test enablement in rbd

considering we are far out of this release and only care about
kubernetes releases from v1.20, there is no need to have this
version check in place for the tests.

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2021-11-03 15:29:04 +05:30 committed by mergify[bot]
parent 1354cfbf03
commit 2ac3f129c0

View File

@ -1112,7 +1112,6 @@ var _ = Describe("RBD", func() {
noKMS, noKMS,
defaultSCName,
f)
})
By("create a PVC-PVC clone and bind it to an app", func() {
@ -1125,7 +1124,6 @@ var _ = Describe("RBD", func() {
noKMS,
noPVCValidation,
f)
})
By("create a thick-provisioned PVC-PVC clone and bind it to an app", func() {
@ -1426,8 +1424,6 @@ var _ = Describe("RBD", func() {
})
By("Resize Filesystem PVC and check application directory size", func() {
// Resize 0.3.0 is only supported from v1.15+
if k8sVersionGreaterEquals(f.ClientSet, 1, 15) {
err := resizePVCAndValidateSize(pvcPath, appPath, f)
if err != nil {
e2elog.Failf("failed to resize filesystem PVC %v", err)
@ -1453,7 +1449,6 @@ var _ = Describe("RBD", func() {
}
// validate created backend rbd images
validateRBDImageCount(f, 0, defaultRBDPool)
}
})
By("Resize Block PVC and check Device size", func() {
@ -2027,7 +2022,6 @@ var _ = Describe("RBD", func() {
}
// validate created backend rbd images
validateRBDImageCount(f, 0, defaultRBDPool)
})
By("validate PVC mounting if snapshot and parent PVC are deleted", func() {
@ -2460,24 +2454,16 @@ var _ = Describe("RBD", func() {
}
// Resize Filesystem PVC and check application directory size
// Resize 0.3.0 is only supported from v1.15+
if k8sVersionGreaterEquals(f.ClientSet, 1, 15) {
err = resizePVCAndValidateSize(pvcPath, appPath, f)
if err != nil {
e2elog.Failf("failed to resize filesystem PVC %v", err)
}
}
// Create a PVC clone and bind it to an app within the namespace
err = createRBDSnapshotClass(f)
if err != nil {
e2elog.Failf("failed to create storageclass with error %v", err)
}
defer func() {
err = deleteRBDSnapshotClass()
if err != nil {
e2elog.Failf("failed to create storageclass with error %v", err)
}
defer func() {
err = deleteRBDSnapshotClass()
if err != nil {
@ -2528,7 +2514,6 @@ var _ = Describe("RBD", func() {
if err != nil {
e2elog.Failf("failed to validate rbd images in pool %s trash with error %v", rbdOptions(defaultRBDPool), err)
}
}
// delete RBD provisioner secret
err = deleteCephUser(f, keyringRBDNamespaceProvisionerUsername)