Merge pull request #2440 from raaizik/rdr-odfinfo

RDR: ODF info CM logic
red-hat-storage · May 19, 2024 · ec44394 · ec44394
2 parents 05df196 + 8d54518
commit ec44394
Show file tree

Hide file tree

Showing 72 changed files with 500 additions and 7,335 deletions.
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -82,17 +82,6 @@ rules:
   - list
   - update
   - watch
-- apiGroups:
-  - cluster.open-cluster-management.io
-  resources:
-  - clusterclaims
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - update
-  - watch
 - apiGroups:
   - config.openshift.io
   resources:

diff --git a/controllers/storagecluster/clusterclaims.go b/controllers/storagecluster/clusterclaims.go
diff --git a/controllers/storagecluster/external_resources_test.go b/controllers/storagecluster/external_resources_test.go
@@ -127,7 +127,8 @@ func createExternalClusterReconcilerFromCustomResources(
 				UninstallModeAnnotation: string(UninstallModeGraceful),
 				CleanupPolicyAnnotation: string(CleanupPolicyDelete),
 			},
-			Finalizers: []string{storageClusterFinalizer},
+			Finalizers:      []string{storageClusterFinalizer},
+			OwnerReferences: []metav1.OwnerReference{{Name: "storage-test", Kind: "StorageSystem", APIVersion: "v1"}},
 		},
 		Spec: api.StorageClusterSpec{
 			ExternalStorage: api.ExternalStorageClusterSpec{

diff --git a/controllers/storagecluster/initialization_reconciler_test.go b/controllers/storagecluster/initialization_reconciler_test.go
@@ -2,6 +2,11 @@ package storagecluster
 
 import (
 	"context"
+	"fmt"
+	"github.com/blang/semver/v4"
+	oprverion "github.com/operator-framework/api/pkg/lib/version"
+	opv1a1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	ocsversion "github.com/red-hat-storage/ocs-operator/v4/version"
 	"os"
 	"testing"
 
@@ -39,7 +44,8 @@ func createStorageCluster(scName, failureDomainName string,
 				UninstallModeAnnotation: string(UninstallModeGraceful),
 				CleanupPolicyAnnotation: string(CleanupPolicyDelete),
 			},
-			Finalizers: []string{storageClusterFinalizer},
+			Finalizers:      []string{storageClusterFinalizer},
+			OwnerReferences: []metav1.OwnerReference{{Name: "storage-test", Kind: "StorageSystem", APIVersion: "v1"}},
 		},
 		Spec: api.StorageClusterSpec{
 			Monitoring: &api.MonitoringSpec{
@@ -349,6 +355,26 @@ func createFakeInitializationStorageClusterReconciler(t *testing.T, obj ...runti
 			Phase: cephv1.ConditionType(util.PhaseReady),
 		},
 	}
+	verOcs, err := semver.Make(getSemVer(ocsversion.Version, 1, true))
+	if err != nil {
+		panic(err)
+	}
+	csv := &opv1a1.ClusterServiceVersion{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      fmt.Sprintf("ocs-operator-%s", sc.Name),
+			Namespace: sc.Namespace,
+		},
+		Spec: opv1a1.ClusterServiceVersionSpec{
+			Version: oprverion.OperatorVersion{Version: verOcs},
+		},
+	}
+
+	rookCephMonSecret := &v1.Secret{
+		ObjectMeta: metav1.ObjectMeta{Name: "rook-ceph-mon", Namespace: sc.Namespace},
+		Data: map[string][]byte{
+			"fsid": []byte(cephFSID),
+		},
+	}
 
 	statusSubresourceObjs := []client.Object{sc}
 	var runtimeObjects []runtime.Object
@@ -363,7 +389,7 @@ func createFakeInitializationStorageClusterReconciler(t *testing.T, obj ...runti
 		}
 	}
 
-	runtimeObjects = append(runtimeObjects, mockNodeList.DeepCopy(), cbp, cfs, cnfs, cnfsbp, cnfssvc, infrastructure, networkConfig)
+	runtimeObjects = append(runtimeObjects, mockNodeList.DeepCopy(), cbp, cfs, cnfs, cnfsbp, cnfssvc, infrastructure, networkConfig, rookCephMonSecret, csv)
 	client := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(runtimeObjects...).WithStatusSubresource(statusSubresourceObjs...).Build()
 
 	return StorageClusterReconciler{