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

e2e: remove 1.17 based test enablement in rbd

Browse Source 
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:25:08 +05:30 committed by mergify[bot]
parent 0f0cda49a7
commit c03969fa65
1 changed files with 138 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
e2e/rbd.go
View File

@ -1102,8 +1102,6 @@ var _ = Describe("RBD", 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() {
// snapshot beta is only supported from v1.17+
if k8sVersionGreaterEquals(f.ClientSet, 1, 17) {
validatePVCSnapshot( validatePVCSnapshot(
defaultCloneCount, defaultCloneCount,
pvcPath, pvcPath,
@ -1114,7 +1112,7 @@ var _ = Describe("RBD", func() {
noKMS, noKMS, noKMS, noKMS,
defaultSCName, defaultSCName,
f) f)
}
}) })
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() {
@ -1873,10 +1871,6 @@ var _ = Describe("RBD", func() {
}) })
By("create rbd clones in different pool", func() { By("create rbd clones in different pool", func() {
// snapshot beta is only supported from v1.17+
if !k8sVersionGreaterEquals(f.ClientSet, 1, 17) {
Skip("pvc restore is only supported from v1.17+")
}
clonePool := "clone-test" clonePool := "clone-test"
// create pool for clones // create pool for clones
err := createPool(f, clonePool) err := createPool(f, clonePool)
@ -1933,8 +1927,6 @@ var _ = Describe("RBD", func() {
}) })
By("create ROX PVC clone and mount it to multiple pods", func() { By("create ROX PVC clone and mount it to multiple pods", func() {
// snapshot beta is only supported from v1.17+
if k8sVersionGreaterEquals(f.ClientSet, 1, 17) {
err := createRBDSnapshotClass(f) err := createRBDSnapshotClass(f)
if err != nil { if err != nil {
e2elog.Failf("failed to create storageclass with error %v", err) e2elog.Failf("failed to create storageclass with error %v", err)
@ -2066,14 +2058,10 @@ var _ = Describe("RBD", func() {
} }
// validate created backend rbd images // validate created backend rbd images
validateRBDImageCount(f, 0, defaultRBDPool) validateRBDImageCount(f, 0, defaultRBDPool)
}
}) })
By("validate PVC mounting if snapshot and parent PVC are deleted", func() { By("validate PVC mounting if snapshot and parent PVC are deleted", func() {
// snapshot beta is only supported from v1.17+
if !k8sVersionGreaterEquals(f.ClientSet, 1, 17) {
Skip("pvc restore is only supported from v1.17+")
}
err := createRBDSnapshotClass(f) err := createRBDSnapshotClass(f)
if err != nil { if err != nil {
e2elog.Failf("failed to create storageclass with error %v", err) e2elog.Failf("failed to create storageclass with error %v", err)
@ -2178,10 +2166,6 @@ var _ = Describe("RBD", func() {
By( By(
"validate PVC mounting if snapshot and parent PVC are deleted chained with depth 2", "validate PVC mounting if snapshot and parent PVC are deleted chained with depth 2",
func() { func() {
// snapshot beta is only supported from v1.17+
if !k8sVersionGreaterEquals(f.ClientSet, 1, 17) {
Skip("pvc restore is only supported from v1.17+")
}
snapChainDepth := 2 snapChainDepth := 2
err := deleteResource(rbdExamplePath + "storageclass.yaml") err := deleteResource(rbdExamplePath + "storageclass.yaml")
@ -2315,10 +2299,6 @@ var _ = Describe("RBD", func() {
}) })
By("validate PVC Clone chained with depth 2", func() { By("validate PVC Clone chained with depth 2", func() {
// snapshot beta is only supported from v1.17+
if !k8sVersionGreaterEquals(f.ClientSet, 1, 17) {
Skip("pvc restore is only supported from v1.17+")
}
cloneChainDepth := 2 cloneChainDepth := 2
err := deleteResource(rbdExamplePath + "storageclass.yaml") err := deleteResource(rbdExamplePath + "storageclass.yaml")
@ -2523,12 +2503,15 @@ var _ = Describe("RBD", func() {
} }
// Create a PVC clone and bind it to an app within the namespace // Create a PVC clone and bind it to an app within the namespace
// snapshot beta is only supported from v1.17+
if k8sVersionGreaterEquals(f.ClientSet, 1, 17) {
err = createRBDSnapshotClass(f) err = createRBDSnapshotClass(f)
if err != nil { if err != nil {
e2elog.Failf("failed to create storageclass with error %v", err) 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() { defer func() {
err = deleteRBDSnapshotClass() err = deleteRBDSnapshotClass()
if err != nil { if err != nil {