From ad7e5ca301d70ae9b7eb1373a543073edda4ad41 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Wed, 18 Dec 2019 16:05:48 +0530 Subject: [PATCH] Add E2E for block PVC resize Signed-off-by: Madhu Rajanna --- e2e/rbd.go | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/e2e/rbd.go b/e2e/rbd.go index e63849764..cc7de69e1 100644 --- a/e2e/rbd.go +++ b/e2e/rbd.go @@ -250,7 +250,7 @@ var _ = Describe("RBD", func() { } }) - By("Resize PVC and check application directory size", func() { + By("Resize Filesystem PVC and check application directory size", func() { v, err := f.ClientSet.Discovery().ServerVersion() if err != nil { e2elog.Logf("failed to get server version with error %v", err) @@ -261,7 +261,7 @@ var _ = Describe("RBD", func() { if v.Major > "1" || (v.Major == "1" && v.Minor >= "15") { err := resizePVCAndValidateSize(pvcPath, appPath, f) if err != nil { - e2elog.Logf("failed to resize PVC %v", err) + e2elog.Logf("failed to resize filesystem PVC %v", err) Fail(err.Error()) } @@ -269,13 +269,30 @@ var _ = Describe("RBD", func() { createRBDStorageClass(f.ClientSet, f, map[string]string{"csi.storage.k8s.io/fstype": "xfs"}) err = resizePVCAndValidateSize(pvcPath, appPath, f) if err != nil { - e2elog.Logf("failed to resize PVC %v", err) + e2elog.Logf("failed to resize filesystem PVC %v", err) Fail(err.Error()) } } }) + By("Resize Block PVC and check Device size", func() { + v, err := f.ClientSet.Discovery().ServerVersion() + if err != nil { + e2elog.Logf("failed to get server version with error %v", err) + Fail(err.Error()) + } + + // Block PVC resize is supported in kubernetes 1.16+ + if v.Major > "1" || (v.Major == "1" && v.Minor >= "16") { + err := resizePVCAndValidateSize(rawPvcPath, rawAppPath, f) + if err != nil { + e2elog.Logf("failed to resize block PVC %v", err) + Fail(err.Error()) + } + } + }) + By("Test unmount after nodeplugin restart", func() { pvc, err := loadPVC(pvcPath) if err != nil {