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

e2e: remove kubernetes 1.22 check

Browse Source 
We run CI jobs on kubernetes 1.22 by default
and we dont need to have a check to make sure
we have atleast Kubernetes 1.22 for few tests.
As we have CI runs on 1.22 by default, Removing
unwanted check.

updates: #3086
depends-on #3255

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2022-07-25 10:10:20 +05:30 committed by mergify[bot]
parent 011d4fc81c
commit efabe70a46
4 changed files with 145 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/cephfs.go
View File

@ -328,7 +328,6 @@ var _ = Describe(cephfsType, func() {
}) })
By("verify RWOP volume support", func() { By("verify RWOP volume support", func() {
if k8sVersionGreaterEquals(f.ClientSet, 1, 22) {
err := createCephfsStorageClass(f.ClientSet, f, true, nil) err := createCephfsStorageClass(f.ClientSet, f, true, nil)
if err != nil { if err != nil {
e2elog.Failf("failed to create CephFS storageclass: %v", err) e2elog.Failf("failed to create CephFS storageclass: %v", err)
@ -373,7 +372,6 @@ var _ = Describe(cephfsType, func() {
if err != nil { if err != nil {
e2elog.Failf("failed to delete CephFS storageclass: %v", err) e2elog.Failf("failed to delete CephFS storageclass: %v", err)
} }
}
}) })
By("check static PVC", func() { By("check static PVC", func() {

2
e2e/nfs.go
View File

@ -371,7 +371,6 @@ var _ = Describe("nfs", func() {
}) })
By("verify RWOP volume support", func() { By("verify RWOP volume support", func() {
if k8sVersionGreaterEquals(f.ClientSet, 1, 22) {
err := createNFSStorageClass(f.ClientSet, f, false, nil) err := createNFSStorageClass(f.ClientSet, f, false, nil)
if err != nil { if err != nil {
e2elog.Failf("failed to create CephFS storageclass: %v", err) e2elog.Failf("failed to create CephFS storageclass: %v", err)
@ -414,7 +413,6 @@ var _ = Describe("nfs", func() {
if err != nil { if err != nil {
e2elog.Failf("failed to delete CephFS storageclass: %v", err) e2elog.Failf("failed to delete CephFS storageclass: %v", err)
} }
}
}) })
By("create a storageclass with pool and a PVC then bind it to an app", func() { By("create a storageclass with pool and a PVC then bind it to an app", func() {

4
e2e/rbd.go
View File

@ -876,7 +876,6 @@ var _ = Describe("RBD", func() {
}) })
By("create a Block mode RWOP PVC and bind it to more than one app", func() { By("create a Block mode RWOP PVC and bind it to more than one app", func() {
if k8sVersionGreaterEquals(f.ClientSet, 1, 22) {
pvc, err := loadPVC(rawPVCRWOPPath) pvc, err := loadPVC(rawPVCRWOPPath)
if err != nil { if err != nil {
e2elog.Failf("failed to load PVC: %v", err) e2elog.Failf("failed to load PVC: %v", err)
@ -913,11 +912,9 @@ var _ = Describe("RBD", func() {
// validate created backend rbd images // validate created backend rbd images
validateRBDImageCount(f, 0, defaultRBDPool) validateRBDImageCount(f, 0, defaultRBDPool)
validateOmapCount(f, 0, rbdType, defaultRBDPool, volumesType) validateOmapCount(f, 0, rbdType, defaultRBDPool, volumesType)
}
}) })
By("create a RWOP PVC and bind it to more than one app", func() { By("create a RWOP PVC and bind it to more than one app", func() {
if k8sVersionGreaterEquals(f.ClientSet, 1, 22) {
pvc, err := loadPVC(pvcRWOPPath) pvc, err := loadPVC(pvcRWOPPath)
if err != nil { if err != nil {
e2elog.Failf("failed to load PVC: %v", err) e2elog.Failf("failed to load PVC: %v", err)
@ -954,7 +951,6 @@ var _ = Describe("RBD", func() {
// validate created backend rbd images // validate created backend rbd images
validateRBDImageCount(f, 0, defaultRBDPool) validateRBDImageCount(f, 0, defaultRBDPool)
validateOmapCount(f, 0, rbdType, defaultRBDPool, volumesType) validateOmapCount(f, 0, rbdType, defaultRBDPool, volumesType)
}
}) })
By("create an erasure coded PVC and bind it to an app", func() { By("create an erasure coded PVC and bind it to an app", func() {

2
e2e/utils.go
View File

@ -578,7 +578,7 @@ func validateNormalUserPVCAccess(pvcPath string, f *framework.Framework) error {
if pvc.Spec.VolumeMode != nil { if pvc.Spec.VolumeMode != nil {
isBlockMode = (*pvc.Spec.VolumeMode == v1.PersistentVolumeBlock) isBlockMode = (*pvc.Spec.VolumeMode == v1.PersistentVolumeBlock)
} }
if (!isBlockMode || k8sVersionGreaterEquals(f.ClientSet, 1, 22)) && !isOpenShift { if !isBlockMode && !isOpenShift {
err = getMetricsForPVC(f, pvc, deployTimeout) err = getMetricsForPVC(f, pvc, deployTimeout)
if err != nil { if err != nil {
return err return err