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 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

78
e2e/cephfs.go
View File

@ -328,51 +328,49 @@ 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) }
} 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) }
} pvc.Namespace = f.UniqueName
pvc.Namespace = f.UniqueName
// create application // create application
app, err := loadApp(appRWOPPath) app, err := loadApp(appRWOPPath)
if err != nil { if err != nil {
e2elog.Failf("failed to load application: %v", err) e2elog.Failf("failed to load application: %v", err)
} }
app.Namespace = f.UniqueName app.Namespace = f.UniqueName
baseAppName := app.Name baseAppName := app.Name
err = createPVCAndvalidatePV(f.ClientSet, pvc, deployTimeout) err = createPVCAndvalidatePV(f.ClientSet, pvc, deployTimeout)
if err != nil { if err != nil {
if rwopMayFail(err) { if rwopMayFail(err) {
e2elog.Logf("RWOP is not supported: %v", err) e2elog.Logf("RWOP is not supported: %v", err)
return return
}
e2elog.Failf("failed to create PVC: %v", err)
} }
err = createApp(f.ClientSet, app, deployTimeout) e2elog.Failf("failed to create PVC: %v", err)
if err != nil { }
e2elog.Failf("failed to create application: %v", err) err = createApp(f.ClientSet, app, deployTimeout)
} if err != nil {
validateSubvolumeCount(f, 1, fileSystemName, subvolumegroup) e2elog.Failf("failed to create application: %v", err)
validateOmapCount(f, 1, cephfsType, metadataPool, volumesType) }
validateSubvolumeCount(f, 1, fileSystemName, subvolumegroup)
validateOmapCount(f, 1, cephfsType, metadataPool, volumesType)
err = validateRWOPPodCreation(f, pvc, app, baseAppName) err = validateRWOPPodCreation(f, pvc, app, baseAppName)
if err != nil { if err != nil {
e2elog.Failf("failed to validate RWOP pod creation: %v", err) e2elog.Failf("failed to validate RWOP pod creation: %v", err)
} }
validateSubvolumeCount(f, 0, fileSystemName, subvolumegroup) validateSubvolumeCount(f, 0, fileSystemName, subvolumegroup)
validateOmapCount(f, 0, cephfsType, metadataPool, volumesType) validateOmapCount(f, 0, cephfsType, metadataPool, volumesType)
err = deleteResource(cephFSExamplePath + "storageclass.yaml") err = deleteResource(cephFSExamplePath + "storageclass.yaml")
if err != nil { if err != nil {
e2elog.Failf("failed to delete CephFS storageclass: %v", err) e2elog.Failf("failed to delete CephFS storageclass: %v", err)
}
} }
}) })

74
e2e/nfs.go
View File

@ -371,49 +371,47 @@ 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) }
} 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) }
} pvc.Namespace = f.UniqueName
pvc.Namespace = f.UniqueName
// create application // create application
app, err := loadApp(appRWOPPath) app, err := loadApp(appRWOPPath)
if err != nil { if err != nil {
e2elog.Failf("failed to load application: %v", err) e2elog.Failf("failed to load application: %v", err)
} }
app.Namespace = f.UniqueName app.Namespace = f.UniqueName
baseAppName := app.Name baseAppName := app.Name
err = createPVCAndvalidatePV(f.ClientSet, pvc, deployTimeout) err = createPVCAndvalidatePV(f.ClientSet, pvc, deployTimeout)
if err != nil { if err != nil {
if rwopMayFail(err) { if rwopMayFail(err) {
e2elog.Logf("RWOP is not supported: %v", err) e2elog.Logf("RWOP is not supported: %v", err)
return return
}
e2elog.Failf("failed to create PVC: %v", err)
} }
err = createApp(f.ClientSet, app, deployTimeout) e2elog.Failf("failed to create PVC: %v", err)
if err != nil { }
e2elog.Failf("failed to create application: %v", err) err = createApp(f.ClientSet, app, deployTimeout)
} if err != nil {
validateSubvolumeCount(f, 1, fileSystemName, defaultSubvolumegroup) e2elog.Failf("failed to create application: %v", err)
}
validateSubvolumeCount(f, 1, fileSystemName, defaultSubvolumegroup)
err = validateRWOPPodCreation(f, pvc, app, baseAppName) err = validateRWOPPodCreation(f, pvc, app, baseAppName)
if err != nil { if err != nil {
e2elog.Failf("failed to validate RWOP pod creation: %v", err) e2elog.Failf("failed to validate RWOP pod creation: %v", err)
} }
validateSubvolumeCount(f, 0, fileSystemName, defaultSubvolumegroup) validateSubvolumeCount(f, 0, fileSystemName, defaultSubvolumegroup)
err = deleteResource(nfsExamplePath + "storageclass.yaml") err = deleteResource(nfsExamplePath + "storageclass.yaml")
if err != nil { if err != nil {
e2elog.Failf("failed to delete CephFS storageclass: %v", err) e2elog.Failf("failed to delete CephFS storageclass: %v", err)
}
} }
}) })

144
e2e/rbd.go
View File

@ -876,85 +876,81 @@ 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)
}
pvc.Namespace = f.UniqueName
app, err := loadApp(rawAppRWOPPath)
if err != nil {
e2elog.Failf("failed to load application: %v", err)
}
app.Namespace = f.UniqueName
baseAppName := app.Name
err = createPVCAndvalidatePV(f.ClientSet, pvc, deployTimeout)
if err != nil {
if rwopMayFail(err) {
e2elog.Logf("RWOP is not supported: %v", err)
return
}
e2elog.Failf("failed to create PVC: %v", err)
}
// validate created backend rbd images
validateRBDImageCount(f, 1, defaultRBDPool)
validateOmapCount(f, 1, rbdType, defaultRBDPool, volumesType)
err = createApp(f.ClientSet, app, deployTimeout)
if err != nil {
e2elog.Failf("failed to create application: %v", err)
}
err = validateRWOPPodCreation(f, pvc, app, baseAppName)
if err != nil {
e2elog.Failf("failed to validate RWOP pod creation: %v", err)
}
// validate created backend rbd images
validateRBDImageCount(f, 0, defaultRBDPool)
validateOmapCount(f, 0, rbdType, defaultRBDPool, volumesType)
} }
pvc.Namespace = f.UniqueName
app, err := loadApp(rawAppRWOPPath)
if err != nil {
e2elog.Failf("failed to load application: %v", err)
}
app.Namespace = f.UniqueName
baseAppName := app.Name
err = createPVCAndvalidatePV(f.ClientSet, pvc, deployTimeout)
if err != nil {
if rwopMayFail(err) {
e2elog.Logf("RWOP is not supported: %v", err)
return
}
e2elog.Failf("failed to create PVC: %v", err)
}
// validate created backend rbd images
validateRBDImageCount(f, 1, defaultRBDPool)
validateOmapCount(f, 1, rbdType, defaultRBDPool, volumesType)
err = createApp(f.ClientSet, app, deployTimeout)
if err != nil {
e2elog.Failf("failed to create application: %v", err)
}
err = validateRWOPPodCreation(f, pvc, app, baseAppName)
if err != nil {
e2elog.Failf("failed to validate RWOP pod creation: %v", err)
}
// validate created backend rbd images
validateRBDImageCount(f, 0, defaultRBDPool)
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)
}
pvc.Namespace = f.UniqueName
app, err := loadApp(appRWOPPath)
if err != nil {
e2elog.Failf("failed to load application: %v", err)
}
app.Namespace = f.UniqueName
baseAppName := app.Name
err = createPVCAndvalidatePV(f.ClientSet, pvc, deployTimeout)
if err != nil {
if rwopMayFail(err) {
e2elog.Logf("RWOP is not supported: %v", err)
return
}
e2elog.Failf("failed to create PVC: %v", err)
}
// validate created backend rbd images
validateRBDImageCount(f, 1, defaultRBDPool)
validateOmapCount(f, 1, rbdType, defaultRBDPool, volumesType)
err = createApp(f.ClientSet, app, deployTimeout)
if err != nil {
e2elog.Failf("failed to create application: %v", err)
}
err = validateRWOPPodCreation(f, pvc, app, baseAppName)
if err != nil {
e2elog.Failf("failed to validate RWOP pod creation: %v", err)
}
// validate created backend rbd images
validateRBDImageCount(f, 0, defaultRBDPool)
validateOmapCount(f, 0, rbdType, defaultRBDPool, volumesType)
} }
pvc.Namespace = f.UniqueName
app, err := loadApp(appRWOPPath)
if err != nil {
e2elog.Failf("failed to load application: %v", err)
}
app.Namespace = f.UniqueName
baseAppName := app.Name
err = createPVCAndvalidatePV(f.ClientSet, pvc, deployTimeout)
if err != nil {
if rwopMayFail(err) {
e2elog.Logf("RWOP is not supported: %v", err)
return
}
e2elog.Failf("failed to create PVC: %v", err)
}
// validate created backend rbd images
validateRBDImageCount(f, 1, defaultRBDPool)
validateOmapCount(f, 1, rbdType, defaultRBDPool, volumesType)
err = createApp(f.ClientSet, app, deployTimeout)
if err != nil {
e2elog.Failf("failed to create application: %v", err)
}
err = validateRWOPPodCreation(f, pvc, app, baseAppName)
if err != nil {
e2elog.Failf("failed to validate RWOP pod creation: %v", err)
}
// validate created backend rbd images
validateRBDImageCount(f, 0, defaultRBDPool)
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