From ca270015197b99cf90520b9d7a5da3e29cb84f4e Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Mon, 12 Aug 2019 11:02:59 +0530 Subject: [PATCH] Fix CI failure in ceph-csi rook master deploys the ceph-csi by default now, this will affect the ceph-csi testing failure, This PR will remove the ceph-csi resources created rook Signed-off-by: Madhu Rajanna --- e2e/e2e_test.go | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 641bb977d..6c398131c 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -9,6 +9,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/kubernetes/test/e2e/framework" + e2elog "k8s.io/kubernetes/test/e2e/framework/log" ) var ( @@ -31,10 +32,56 @@ func init() { fmt.Println("timeout for deploytimeout ", deployTimeout) } +// removeCephCSIResource is a temporary fix for CI to remove the ceph-csi resources deployed by rook +func removeCephCSIResource() { + // cleanup rbd and cephfs deamonset deployed by rook + _, err := framework.RunKubectl("delete", "-nrook-ceph", "daemonset", "csi-cephfsplugin") + if err != nil { + e2elog.Logf("failed to delete rbd daemonset %v", err) + } + _, err = framework.RunKubectl("delete", "-nrook-ceph", "daemonset", "csi-rbdplugin") + if err != nil { + e2elog.Logf("failed to delete cephfs daemonset %v", err) + } + + // cleanup rbd and cephfs statefulset deployed by rook + _, err = framework.RunKubectl("delete", "-nrook-ceph", "statefulset", "csi-rbdplugin-provisioner") + if err != nil { + e2elog.Logf("failed to delete rbd statefulset %v", err) + } + _, err = framework.RunKubectl("delete", "-nrook-ceph", "statefulset", "csi-cephfsplugin-provisioner") + if err != nil { + e2elog.Logf("failed to delete cephfs statefulset %v", err) + } + + // cleanup rbd cluster roles deployed by rook + rbdPath := fmt.Sprintf("%s/%s/", rbdDirPath, "v1.13") + _, err = framework.RunKubectl("delete", "-f", rbdPath+rbdProvisionerRBAC) + if err != nil { + e2elog.Logf("failed to delete provisioner rbac %v", err) + } + _, err = framework.RunKubectl("delete", "-f", rbdPath+rbdNodePluginRBAC) + if err != nil { + e2elog.Logf("failed to delete nodeplugin rbac %v", err) + } + + // cleanup cephfs cluster roles deployed by rook + cephfsPath := fmt.Sprintf("%s/%s/", cephfsDirPath, "v1.13") + _, err = framework.RunKubectl("delete", "-f", cephfsPath+cephfsProvisionerRBAC) + if err != nil { + e2elog.Logf("failed to delete provisioner rbac %v", err) + } + _, err = framework.RunKubectl("delete", "-f", cephfsPath+cephfsNodePluginRBAC) + if err != nil { + e2elog.Logf("failed to delete nodeplugin rbac %v", err) + } +} + // BeforeSuite deploys the rook-operator and ceph cluster var _ = BeforeSuite(func() { if rookRequired { deployRook() + removeCephCSIResource() } })