Merge pull request rook#13372 from rook/mergify/bp/release-1.13/pr-13370

ci: delete svg in helm test (backport rook#13370)
travisn · Dec 12, 2023 · 1647c2a · 1647c2a
2 parents 65c9ec8 + f793d1e
commit 1647c2a
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/tests/framework/clients/filesystem.go b/tests/framework/clients/filesystem.go
@@ -135,8 +135,15 @@ func (f *FilesystemOperation) ScaleDown(name, namespace string) error {
 func (f *FilesystemOperation) Delete(name, namespace string) error {
 	ctx := context.TODO()
 	options := &metav1.DeleteOptions{}
+
+	logger.Infof("Deleting subvolumegroup %s in namespace %s dependent of ceph filesystem %s", name+"-csi", namespace, name)
+	err := f.k8sh.RookClientset.CephV1().CephFilesystemSubVolumeGroups(namespace).Delete(ctx, name+"-csi", *options)
+	if err != nil && !kerrors.IsNotFound(err) {
+		return err
+	}
+
 	logger.Infof("Deleting filesystem %s in namespace %s", name, namespace)
-	err := f.k8sh.RookClientset.CephV1().CephFilesystems(namespace).Delete(ctx, name, *options)
+	err = f.k8sh.RookClientset.CephV1().CephFilesystems(namespace).Delete(ctx, name, *options)
 	if err != nil && !kerrors.IsNotFound(err) {
 		return err
 	}