WIP: Enhance RestoreCrd to Support OCS CRs Alongside Rook CRs

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

cmd/commands/restore.go

@@ -31,6 +31,6 @@ var RestoreCmd = &cobra.Command{
 		verifyOperatorPodIsRunning(cmd.Context(), clientSets)
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		restore.RestoreCrd(cmd.Context(), clientSets, operatorNamespace, cephClusterNamespace, args)
+		restore.RestoreCrd(cmd.Context(), clientSets, operatorNamespace, cephClusterNamespace, nil, nil, args)
 	},
 }

pkg/crds/crds.go

@@ -55,8 +55,10 @@ var CephResources = []string{
 }
 
 const (
-	CephRookIoGroup          = "ceph.rook.io"
-	CephRookResourcesVersion = "v1"
+	CephRookIoGroup              = "ceph.rook.io"
+	CephRookResourcesVersion     = "v1"
+	OcsOpenshiftIoGroup          = "ocs.openshift.io"
+	OcsOpenshiftResourcesVersion = "v1"
 )
 
 const (

pkg/restore/crd.go

@@ -32,7 +32,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 )
 
-func RestoreCrd(ctx context.Context, k8sclientset *k8sutil.Clientsets, operatorNamespace, clusterNamespace string, args []string) {
+func RestoreCrd(ctx context.Context, k8sclientset *k8sutil.Clientsets, operatorNamespace, clusterNamespace string,
+	groupNameOptional, versionResourceOptional *string, args []string) {
 	crd := args[0]
 
 	var crName string
@@ -42,7 +43,16 @@ func RestoreCrd(ctx context.Context, k8sclientset *k8sutil.Clientsets, operatorN
 	}
 
 	logging.Info("Detecting which resources to restore for crd %q", crd)
-	crdList, err := k8sclientset.ListResourcesDynamically(ctx, crds.CephRookIoGroup, crds.CephRookResourcesVersion, crd, clusterNamespace)
+	var groupName, versionResource string
+	// Set default values for groupName and versionResource
+	if groupNameOptional == nil || versionResourceOptional == nil {
+		groupName = crds.CephRookIoGroup
+		versionResource = crds.CephRookResourcesVersion
+	} else {
+		groupName = *groupNameOptional
+		versionResource = *versionResourceOptional
+	}
+	crdList, err := k8sclientset.ListResourcesDynamically(ctx, groupName, versionResource, crd, clusterNamespace)
 	if err != nil {
 		logging.Fatal(fmt.Errorf("Failed to list resources for crd %v", err))
 	}