mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 18:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues in E2E cleanup

Browse Source 
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna
2019-08-07 20:23:39 +05:30
parent 0063727199
commit 4ed187eb3f
3 changed files with 50 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
e2e/cephfs.go
View File

@ -36,6 +36,25 @@ func deployCephfsPlugin() {
framework.RunKubectlOrDie("apply", "-f", cephfsDirPath+cephfsNodePluginRBAC)
}
func deleteCephfsPlugin() {
_, err := framework.RunKubectl("delete", "-f", cephfsDirPath+cephfsProvisioner)
if err != nil {
e2elog.Logf("failed to delete cephfs provisioner %v", err)
}
_, err = framework.RunKubectl("delete", "-f", cephfsDirPath+cephfsProvisionerRBAC)
if err != nil {
e2elog.Logf("failed to delete cephfs provisioner rbac %v", err)
}
_, err = framework.RunKubectl("delete", "-f", cephfsDirPath+cephfsNodePlugin)
if err != nil {
e2elog.Logf("failed to delete cephfs nodeplugin %v", err)
}
_, err = framework.RunKubectl("delete", "-f", cephfsDirPath+cephfsNodePluginRBAC)
if err != nil {
e2elog.Logf("failed to delete cephfs nodeplugin rbac %v", err)
}
}
var _ = Describe("cephfs", func() {
f := framework.NewDefaultFramework("cephfs")
// deploy cephfs CSI
@ -48,13 +67,8 @@ var _ = Describe("cephfs", func() {
})
AfterEach(func() {
cephfsFiles := getFilesinDirectory(cephfsDirPath)
for _, file := range cephfsFiles {
res, err := framework.RunKubectl("delete", "-f", cephfsDirPath+file.Name())
if err != nil {
e2elog.Logf("failed to delete resource in %s with err %v", res, err)
}
}
deleteCephfsPlugin()
deleteConfiMap(cephfsDirPath)
deleteResource(cephfsExamplePath + "secret.yaml")
deleteResource(cephfsExamplePath + "storageclass.yaml")
deleteFileSystem()