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 rbd upgrade tests

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

29
e2e/upgrade-rbd.go
View File

@ -158,10 +158,7 @@ var _ = Describe("RBD Upgrade Testing", func() {
var err error var err error
label := make(map[string]string) label := make(map[string]string)
data := "check data persists" data := "check data persists"
v, err := f.ClientSet.Discovery().ServerVersion()
if err != nil {
e2elog.Failf("failed to get server version with error %v", err)
}
pvc, err = loadPVC(pvcPath) pvc, err = loadPVC(pvcPath)
if pvc == nil { if pvc == nil {
e2elog.Failf("failed to load pvc with error %v", err) e2elog.Failf("failed to load pvc with error %v", err)
@ -209,7 +206,7 @@ var _ = Describe("RBD Upgrade Testing", func() {
} }
// 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) {
// Create snapshot of the pvc // Create snapshot of the pvc
snapshotPath := rbdExamplePath + "snapshot.yaml" snapshotPath := rbdExamplePath + "snapshot.yaml"
snap := getSnapshot(snapshotPath) snap := getSnapshot(snapshotPath)
@ -246,12 +243,9 @@ var _ = Describe("RBD Upgrade Testing", func() {
pvcClonePath := rbdExamplePath + "pvc-restore.yaml" pvcClonePath := rbdExamplePath + "pvc-restore.yaml"
appClonePath := rbdExamplePath + "pod-restore.yaml" appClonePath := rbdExamplePath + "pod-restore.yaml"
label := make(map[string]string) label := make(map[string]string)
v, err := f.ClientSet.Discovery().ServerVersion()
if err != nil {
e2elog.Failf("failed to get server version 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) {
pvcClone, err := loadPVC(pvcClonePath) pvcClone, err := loadPVC(pvcClonePath)
if err != nil { if err != nil {
e2elog.Failf("failed to load pvc with error %v", err) e2elog.Failf("failed to load pvc with error %v", err)
@ -298,12 +292,9 @@ var _ = Describe("RBD Upgrade Testing", func() {
pvcSmartClonePath := rbdExamplePath + "pvc-clone.yaml" pvcSmartClonePath := rbdExamplePath + "pvc-clone.yaml"
appSmartClonePath := rbdExamplePath + "pod-clone.yaml" appSmartClonePath := rbdExamplePath + "pod-clone.yaml"
label := make(map[string]string) label := make(map[string]string)
v, err := f.ClientSet.Discovery().ServerVersion()
if err != nil {
e2elog.Failf("failed to get server version 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) {
pvcClone, err := loadPVC(pvcSmartClonePath) pvcClone, err := loadPVC(pvcSmartClonePath)
if err != nil { if err != nil {
e2elog.Failf("failed to load pvc with error %v", err) e2elog.Failf("failed to load pvc with error %v", err)
@ -349,16 +340,14 @@ var _ = Describe("RBD Upgrade Testing", func() {
By("Resize pvc and verify expansion", func() { By("Resize pvc and verify expansion", func() {
pvcExpandSize := "5Gi" pvcExpandSize := "5Gi"
label := make(map[string]string) label := make(map[string]string)
v, err := f.ClientSet.Discovery().ServerVersion()
if err != nil {
e2elog.Failf("failed to get server version 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) {
label[appKey] = appLabel label[appKey] = appLabel
opt := metav1.ListOptions{ opt := metav1.ListOptions{
LabelSelector: fmt.Sprintf("%s=%s", appKey, label[appKey]), LabelSelector: fmt.Sprintf("%s=%s", appKey, label[appKey]),
} }
var err error
pvc, err = f.ClientSet.CoreV1().PersistentVolumeClaims(pvc.Namespace).Get(context.TODO(), pvc.Name, metav1.GetOptions{}) pvc, err = f.ClientSet.CoreV1().PersistentVolumeClaims(pvc.Namespace).Get(context.TODO(), pvc.Name, metav1.GetOptions{})
if err != nil { if err != nil {
e2elog.Failf("failed to get pvc with error %v", err) e2elog.Failf("failed to get pvc with error %v", err)