controllers: send the client profile mapping required for DR

controllers/util/k8sutil.go

@@ -52,6 +52,8 @@ const (
 
 	OdfInfoNamespacedNameClaimName      = "odfinfo.odf.openshift.io"
 	ExitCodeThatShouldRestartTheProcess = 42
+
+	BlockPoolMirroringTargetIDAnnotation = "ocs.openshift.io/mirroring-target-id"
 )
 
 var podNamespace = os.Getenv(PodNamespaceEnvVar)

deploy/ocs-operator/manifests/provider-role.yaml

@@ -16,6 +16,7 @@ rules:
     resources:
       - cephfilesystemsubvolumegroups
       - cephblockpoolradosnamespaces
+      - cephblockpools
     verbs:
       - get
       - list

go.mod

@@ -11,7 +11,7 @@ replace github.com/red-hat-storage/ocs-operator/services/provider/api/v4 => ./se
 require (
 	github.com/RHsyseng/operator-utils v1.4.13
 	github.com/blang/semver/v4 v4.0.0
-	github.com/ceph/ceph-csi-operator/api v0.0.0-20240812072523-4d50cf3a32a0
+	github.com/ceph/ceph-csi-operator/api v0.0.0-20241114115439-f325f74205d3
 	github.com/ceph/ceph-csi/api v0.0.0-20240815120002-0eabe32b7634
 	github.com/go-logr/logr v1.4.2
 	github.com/google/go-cmp v0.6.0

go.sum

@@ -132,8 +132,8 @@ github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4r
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/ceph/ceph-csi-operator/api v0.0.0-20240812072523-4d50cf3a32a0 h1:LIAWGeOu1JzrhknCyD0JbuCUuCuhfiY/H+cBz4nsUcg=
-github.com/ceph/ceph-csi-operator/api v0.0.0-20240812072523-4d50cf3a32a0/go.mod h1:odEUoarG26wXBCC2l4O4nMWhAz6VTKr2FRkv9yELgi8=
+github.com/ceph/ceph-csi-operator/api v0.0.0-20241114115439-f325f74205d3 h1:ft8h5V7BfQqIGJAyiTvn6x86Oi/yMs8yqW7rfKvN9SQ=
+github.com/ceph/ceph-csi-operator/api v0.0.0-20241114115439-f325f74205d3/go.mod h1:odEUoarG26wXBCC2l4O4nMWhAz6VTKr2FRkv9yELgi8=
 github.com/ceph/ceph-csi/api v0.0.0-20240815120002-0eabe32b7634 h1:d324xJccJ9CmP4EE8DirsDnGh+9VVCLHALW1RtHldwI=
 github.com/ceph/ceph-csi/api v0.0.0-20240815120002-0eabe32b7634/go.mod h1:wdTHxRuI5lEeHRgOgOY29Wxd+C29RvvMGHu9nEqV56E=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=

rbac/provider-role.yaml

@@ -16,6 +16,7 @@ rules:
     resources:
       - cephfilesystemsubvolumegroups
       - cephblockpoolradosnamespaces
+      - cephblockpools
     verbs:
       - get
       - list

services/provider/server/server.go

@@ -11,6 +11,7 @@ import (
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
+	nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1"
 	"math"
 	"net"
 	"slices"
@@ -21,7 +22,6 @@ import (
 	"k8s.io/utils/ptr"
 
 	"github.com/blang/semver/v4"
-	nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1"
 	quotav1 "github.com/openshift/api/quota/v1"
 	routev1 "github.com/openshift/api/route/v1"
 	opv1a1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
@@ -62,11 +62,8 @@ const (
 	ramenDRReplicationIDKey = "ramendr.openshift.io/replicationid"
 	ramenDRFlattenModeKey   = "replication.storage.openshift.io/flatten-mode"
 	oneGibInBytes           = 1024 * 1024 * 1024
-)
-
-const (
-	monConfigMap = "rook-ceph-mon-endpoints"
-	monSecret    = "rook-ceph-mon"
+	monConfigMap            = "rook-ceph-mon-endpoints"
+	monSecret               = "rook-ceph-mon"
 )
 
 type OCSProviderServer struct {
@@ -423,6 +420,45 @@ func (s *OCSProviderServer) getExternalResources(ctx context.Context, consumerRe
 
 	}
 
+	cbpList := &rookCephv1.CephBlockPoolList{}
+	err = s.client.List(ctx, cbpList, client.InNamespace(s.namespace))
+	if err != nil {
+		return nil, fmt.Errorf("failed to list cephBlockPools in namespace. %v", err)
+	}
+	blockPoolMapping := []csiopv1a1.BlockPoolIdPair{}
+	for i := range cbpList.Items {
+		cephBlockPool := &cbpList.Items[i]
+		remoteBlockPoolID := cephBlockPool.GetAnnotations()[util.BlockPoolMirroringTargetIDAnnotation]
+		if remoteBlockPoolID != "" {
+			localBlockPoolID := strconv.Itoa(cephBlockPool.Status.PoolID)
+			blockPoolMapping = append(
+				blockPoolMapping,
+				csiopv1a1.BlockPoolIdPair{localBlockPoolID, remoteBlockPoolID},
+			)
+		}
+	}
+
+	if len(blockPoolMapping) > 0 {
+		// This is an assumption and should go away when deprecating the StorageClaim API
+		// The current proposal is to read the clientProfile name from the storageConsumer status and
+		// the remote ClientProfile name should be fetched from the GetClientsInfo rpc
+		clientName := consumerResource.Status.Client.Name
+		clientProfileName := util.CalculateMD5Hash(fmt.Sprintf("%s-ceph-rbd", clientName))
+		extR = append(extR, &pb.ExternalResource{
+			Name: consumerResource.Status.Client.Name,
+			Kind: "ClientProfileMapping",
+			Data: mustMarshal(&csiopv1a1.ClientProfileMappingSpec{
+				Mappings: []csiopv1a1.MappingsSpec{
+					{
+						LocalClientProfile:  clientProfileName,
+						RemoteClientProfile: clientProfileName,
+						BlockPoolIdMapping:  blockPoolMapping,
+					},
+				},
+			}),
+		})
+	}
+
 	// Fetch noobaa remote secret and management address and append to extResources
 	consumerName := consumerResource.Name
 	noobaaOperatorSecret := &v1.Secret{}

vendor/modules.txt

@@ -13,7 +13,7 @@ github.com/blang/semver/v4
 # github.com/cenkalti/backoff/v4 v4.3.0
 ## explicit; go 1.18
 github.com/cenkalti/backoff/v4
-# github.com/ceph/ceph-csi-operator/api v0.0.0-20240812072523-4d50cf3a32a0
+# github.com/ceph/ceph-csi-operator/api v0.0.0-20241114115439-f325f74205d3
 ## explicit; go 1.22.0
 github.com/ceph/ceph-csi-operator/api/v1alpha1
 # github.com/ceph/ceph-csi/api v0.0.0-20240815120002-0eabe32b7634