add crd list and check storagecluster ownership

Signed-off-by: Oded Viner <[email protected]>

Author: OdedViner

cmd/odf/restore/crds.go

@@ -5,9 +5,9 @@ import (
 	"strings"
 
 	"github.com/red-hat-storage/odf-cli/cmd/odf/root"
-	"github.com/red-hat-storage/odf-cli/pkg/crd"
 	"github.com/rook/kubectl-rook-ceph/pkg/k8sutil"
 	"github.com/rook/kubectl-rook-ceph/pkg/logging"
+	pkgrestore "github.com/rook/kubectl-rook-ceph/pkg/restore"
 	"github.com/spf13/cobra"
 )
 
@@ -49,6 +49,15 @@ func parseFullyQualifiedCRD(fqcrd string) (resourceName, groupName, version stri
 	return resourceName, groupName, ver, nil
 }
 
+func contains(slice []string, item string) bool {
+	for _, s := range slice {
+		if s == item {
+			return true
+		}
+	}
+	return false
+}
+
 // deletedCmd represents the deleted command
 var deletedCmd = &cobra.Command{
 	Use:                "deleted",
@@ -73,7 +82,43 @@ var deletedCmd = &cobra.Command{
 		if len(args) > 1 {
 			newArgs[1] = args[1]
 		}
-		crd.RestoreCrdNew(cmd.Context(), root.ClientSets, root.OperatorNamespace, root.StorageClusterNamespace, groupName, version, newArgs)
+		var customResources []pkgrestore.CustomResource
+		if contains(newArgs, "storageclusters") {
+			customResources = []pkgrestore.CustomResource{
+				// ceph.rook.io/v1
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephblockpoolradosnamespaces"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephblockpools"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephbucketnotifications"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephbuckettopics"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephclients"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephclusters"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephcosidrivers"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephfilesystemmirrors"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephfilesystems"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephfilesystemsubvolumegroups"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephnfses"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephobjectrealms"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephobjectstores"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephobjectstoreusers"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephobjectzonegroups"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephobjectzones"},
+				{Group: "ceph.rook.io", Version: "v1", Resource: "cephrbdmirrors"},
+
+				// noobaa.io/v1alpha1
+				{Group: "noobaa.io", Version: "v1alpha1", Resource: "backingstores"},
+				{Group: "noobaa.io", Version: "v1alpha1", Resource: "bucketclasses"},
+				{Group: "noobaa.io", Version: "v1alpha1", Resource: "namespacestores"},
+				{Group: "noobaa.io", Version: "v1alpha1", Resource: "noobaaaccounts"},
+				{Group: "noobaa.io", Version: "v1alpha1", Resource: "noobaas"},
+
+				// ocs.openshift.io/v1alpha1
+				{Group: "ocs.openshift.io", Version: "v1alpha1", Resource: "storageconsumers"},
+			}
+		} else {
+			customResources = []pkgrestore.CustomResource{}
+		}
+
+		pkgrestore.RestoreCrd(cmd.Context(), root.ClientSets, root.OperatorNamespace, root.StorageClusterNamespace, groupName, version, "ocs-operator", customResources, newArgs)
 		k8sutil.SetDeploymentScale(cmd.Context(), root.ClientSets.Kube, root.OperatorNamespace, "ocs-operator", 1)
 	},
 }

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/ramendr/ramenctl v0.4.0
 	github.com/red-hat-storage/ocs-operator/api/v4 v4.0.0-20240701091545-dfffbde82a9d
-	github.com/rook/kubectl-rook-ceph v0.9.3
+	github.com/rook/kubectl-rook-ceph v0.9.4-0.20250428051344-dbfe77cc57a1
 	github.com/rook/rook v1.17.1
 	github.com/spf13/cobra v1.9.1
 	github.com/stretchr/testify v1.10.0

go.sum

@@ -743,8 +743,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
 github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
-github.com/rook/kubectl-rook-ceph v0.9.3 h1:+7THA8a+S2ArJrs9jpY1eJscAjPBKjlLXSmCVPU3eoY=
-github.com/rook/kubectl-rook-ceph v0.9.3/go.mod h1:dOQ+Yccc41DxZqe9jpvAUHsYTquYP/SKClrPmG70SLM=
+github.com/rook/kubectl-rook-ceph v0.9.4-0.20250428051344-dbfe77cc57a1 h1:znvPe0apxkTdkdiVINk0DfUbMGt6Vv+I9mgKfsr3odY=
+github.com/rook/kubectl-rook-ceph v0.9.4-0.20250428051344-dbfe77cc57a1/go.mod h1:UvOPYgfA3+ulKE2omD+A6g82hst24jwO4gY9JIZqfu8=
 github.com/rook/rook v1.17.1 h1:nNUGesl5UtCVGi8Ta/Gl2m5z9rNmqnEzqSjY6vRFzKA=
 github.com/rook/rook v1.17.1/go.mod h1:Z5nuT7cGJLek9nRDH92J3XTcdqGMIyGDsFYo/O3NuT0=
 github.com/rook/rook/pkg/apis v0.0.0-20241216163035-3170ac6a0c58 h1:z7TkRb4D+XvXIGg4ClSjZw8gAPQcZg9zUSFfZ0pUcTY=