diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index 8d08c3fa9..206b880fa 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -93,7 +93,7 @@ func (h *CephInstaller) CreateCephCRDs() error { } // ensure all the cluster CRDs are removed - if err = h.k8shelper.PurgeClusters(); err != nil { + if err = h.purgeClusters(); err != nil { logger.Warningf("could not purge cluster crds. %+v", err) } @@ -450,6 +450,30 @@ func (h *CephInstaller) UninstallRookFromMultipleNS(systemNamespace string, name } } +func (h *CephInstaller) purgeClusters() error { + // get all namespaces + namespaces, err := h.k8shelper.Clientset.CoreV1().Namespaces().List(metav1.ListOptions{}) + if err != nil { + return fmt.Errorf("failed to get namespaces. %+v", err) + } + + // look for the clusters in all namespaces + for _, n := range namespaces.Items { + namespace := n.Name + logger.Infof("looking in namespace %s for clusters to purge", namespace) + clusters, err := h.k8shelper.RookClientset.CephV1().CephClusters(namespace).List(metav1.ListOptions{}) + if err != nil { + logger.Warningf("failed to get clusters in namespace %s. %+v", namespace, err) + continue + } + if len(clusters.Items) > 0 { + logger.Warningf("FOUND UNEXPECTED CLUSTER IN NAMESPACE %s. Removing...", namespace) + h.UninstallRook(namespace) + } + } + return nil +} + func (h *CephInstaller) checkCephHealthStatus(namespace string) { clusterResource, err := h.k8shelper.RookClientset.CephV1().CephClusters(namespace).Get(namespace, metav1.GetOptions{}) assert.Nil(h.T(), err) diff --git a/tests/framework/utils/k8s_helper.go b/tests/framework/utils/k8s_helper.go index 6fdbdfddd..802b03e56 100644 --- a/tests/framework/utils/k8s_helper.go +++ b/tests/framework/utils/k8s_helper.go @@ -128,35 +128,6 @@ func (k8sh *K8sHelper) Kubectl(args ...string) (string, error) { return result, nil } -func (k8sh *K8sHelper) PurgeClusters() error { - // get all namespaces - namespaces, err := k8sh.Clientset.CoreV1().Namespaces().List(metav1.ListOptions{}) - if err != nil { - return fmt.Errorf("failed to get namespaces to remove finalizers. %+v", err) - } - - // look for the clusters in all namespaces - for _, n := range namespaces.Items { - namespace := n.Name - logger.Infof("looking in namespace %s for clusters to purge", namespace) - clusters, err := k8sh.RookClientset.CephV1().CephClusters(namespace).List(metav1.ListOptions{}) - if err != nil { - logger.Warningf("failed to get clusters in namespace %s. %+v", namespace, err) - continue - } - for _, cluster := range clusters.Items { - logger.Infof("Ensuring rook cluster crd %s in namespace %s is deleted", cluster.Name, namespace) - if _, err := k8sh.Kubectl("patch", "cephclusters.ceph.rook.io", cluster.Name, "-n", namespace, "-p", `{"metadata":{"finalizers": []}}`, "--type=merge"); err != nil { - logger.Warningf("failed to remove finalizer from cluster %s. %+v", cluster.Name, err) - } - if err := k8sh.RookClientset.CephV1().CephClusters(namespace).Delete(cluster.Name, &metav1.DeleteOptions{}); err != nil { - logger.Warningf("failed to delete cluster %s", cluster.Name) - } - } - } - return nil -} - // KubectlWithStdin is wrapper for executing kubectl commands in stdin func (k8sh *K8sHelper) KubectlWithStdin(stdin string, args ...string) (string, error) {