From a4655f7549de98c8d8665de73bc661e2e857df40 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 7 Jun 2019 12:22:58 +0530 Subject: [PATCH] create config map for cephfs add fs name to storageclass in e2e Signed-off-by: Madhu Rajanna --- e2e/cephfs.go | 3 ++- e2e/rbd.go | 2 +- e2e/utils.go | 10 ++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/e2e/cephfs.go b/e2e/cephfs.go index f1d73193b..324529b58 100644 --- a/e2e/cephfs.go +++ b/e2e/cephfs.go @@ -35,8 +35,9 @@ var _ = Describe("cephfs", func() { //deploy cephfs CSI BeforeEach(func() { createFileSystem(f.ClientSet) + createConfigMap(f.ClientSet, f) deployCephfsPlugin() - createCephfsStorageClass(f.ClientSet) + createCephfsStorageClass(f.ClientSet, f) createCephfsSecret(f.ClientSet, f) }) diff --git a/e2e/rbd.go b/e2e/rbd.go index 664e3e2c6..5d01e2769 100644 --- a/e2e/rbd.go +++ b/e2e/rbd.go @@ -36,7 +36,7 @@ var _ = Describe("RBD", func() { //deploy RBD CSI BeforeEach(func() { createRBDPool() - createRBDConfigMap(f.ClientSet, f) + createConfigMap(f.ClientSet, f) deployRBDPlugin() createRBDStorageClass(f.ClientSet, f) createRBDSecret(f.ClientSet, f) diff --git a/e2e/utils.go b/e2e/utils.go index abb5e1a5e..803cd4555 100644 --- a/e2e/utils.go +++ b/e2e/utils.go @@ -154,10 +154,16 @@ func getStorageClass(c kubernetes.Interface, path string) scv1.StorageClass { return sc } -func createCephfsStorageClass(c kubernetes.Interface) { +func createCephfsStorageClass(c kubernetes.Interface, f *framework.Framework) { scPath := fmt.Sprintf("%s/%s", cephfsExamplePath, "storageclass.yaml") sc := getStorageClass(c, scPath) sc.Parameters["pool"] = "myfs-data0" + sc.Parameters["fsName"] = "myfs" + fsID := execCommandInToolBox(f, "ceph fsid") + //remove new line present in fsID + fsID = strings.Trim(fsID, "\n") + + sc.Parameters["clusterID"] = fsID _, err := c.StorageV1().StorageClasses().Create(&sc) Expect(err).Should(BeNil()) } @@ -177,7 +183,7 @@ func createRBDStorageClass(c kubernetes.Interface, f *framework.Framework) { Expect(err).Should(BeNil()) } -func createRBDConfigMap(c kubernetes.Interface, f *framework.Framework) { +func createConfigMap(c kubernetes.Interface, f *framework.Framework) { path := rbdDirPath + rbdConfigMap cm := v1.ConfigMap{} err := unmarshal(path, &cm)