@@ -31,12 +31,11 @@ import (
3131 csiopv1a1 "github.com/ceph/ceph-csi-operator/api/v1alpha1"
3232 "github.com/go-logr/logr"
3333
34+ replicationv1alpha1 "github.com/csi-addons/kubernetes-csi-addons/api/replication.storage/v1alpha1"
3435 snapapi "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
35- ramenv1alpha1 "github.com/ramendr/ramen/api/v1alpha1"
3636 providerclient "github.com/red-hat-storage/ocs-operator/services/provider/api/v4/client"
3737 corev1 "k8s.io/api/core/v1"
3838 storagev1 "k8s.io/api/storage/v1"
39- extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
4039 "k8s.io/apimachinery/pkg/api/errors"
4140 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4241 "k8s.io/apimachinery/pkg/runtime"
@@ -45,7 +44,6 @@ import (
4544 "sigs.k8s.io/controller-runtime/pkg/cache"
4645 "sigs.k8s.io/controller-runtime/pkg/client"
4746 "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
48- "sigs.k8s.io/controller-runtime/pkg/handler"
4947 ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
5048 "sigs.k8s.io/controller-runtime/pkg/predicate"
5149 "sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -56,9 +54,8 @@ const (
5654 storageClaimAnnotation = "ocs.openshift.io/storageclaim"
5755 keyRotationAnnotation = "keyrotation.csiaddons.openshift.io/schedule"
5856
59- pvClusterIDIndexName = "index:persistentVolumeClusterID"
60- vscClusterIDIndexName = "index:volumeSnapshotContentCSIDriver"
61- drClusterConfigCRDName = "drclusterconfigs.ramendr.openshift.io"
57+ pvClusterIDIndexName = "index:persistentVolumeClusterID"
58+ vscClusterIDIndexName = "index:volumeSnapshotContentCSIDriver"
6259)
6360
6461// StorageClaimReconciler reconciles a StorageClaim object
@@ -67,7 +64,6 @@ type StorageClaimReconciler struct {
6764 cache.Cache
6865 Scheme * runtime.Scheme
6966 OperatorNamespace string
70- AvailableCrds map [string ]bool
7167
7268 log logr.Logger
7369 ctx context.Context
@@ -115,20 +111,8 @@ func (r *StorageClaimReconciler) SetupWithManager(mgr ctrl.Manager) error {
115111 For (& v1alpha1.StorageClaim {}, builder .WithPredicates (generationChangePredicate )).
116112 Owns (& storagev1.StorageClass {}).
117113 Owns (& snapapi.VolumeSnapshotClass {}).
118- Owns (& csiopv1a1.ClientProfile {}, builder .WithPredicates (generationChangePredicate )).
119- Watches (
120- & extv1.CustomResourceDefinition {},
121- & handler.EnqueueRequestForObject {},
122- builder .WithPredicates (
123- utils .NamePredicate (drClusterConfigCRDName ),
124- utils .CrdCreateAndDeletePredicate (& r .log , drClusterConfigCRDName , r .AvailableCrds [drClusterConfigCRDName ]),
125- ),
126- builder .OnlyMetadata ,
127- )
128-
129- if r .AvailableCrds [drClusterConfigCRDName ] {
130- bldr = bldr .Owns (& ramenv1alpha1.DRClusterConfig {}, builder .WithPredicates (generationChangePredicate ))
131- }
114+ Owns (& replicationv1alpha1.VolumeReplicationClass {}, builder .WithPredicates (generationChangePredicate )).
115+ Owns (& csiopv1a1.ClientProfile {}, builder .WithPredicates (generationChangePredicate ))
132116
133117 return bldr .Complete (r )
134118}
@@ -142,7 +126,7 @@ func (r *StorageClaimReconciler) SetupWithManager(mgr ctrl.Manager) error {
142126//+kubebuilder:rbac:groups=core,resources=persistentvolumes,verbs=get;list;watch
143127//+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotcontents,verbs=get;list;watch
144128//+kubebuilder:rbac:groups=csi.ceph.io,resources=clientprofiles,verbs=get;list;update;create;watch;delete
145- //+kubebuilder:rbac:groups=ramendr. openshift.io,resources=drclusterconfigs ,verbs=get;list;update ;create;watch ;delete
129+ //+kubebuilder:rbac:groups=replication.storage. openshift.io,resources=volumereplicationclass ,verbs=get;list;watch ;create;delete
146130
147131// Reconcile is part of the main kubernetes reconciliation loop which aims to
148132// move the current state of the cluster closer to the desired state.
@@ -159,15 +143,6 @@ func (r *StorageClaimReconciler) Reconcile(ctx context.Context, req ctrl.Request
159143 r .ctx = ctrllog .IntoContext (ctx , r .log )
160144 r .log .Info ("Reconciling StorageClaim." )
161145
162- crd := & metav1.PartialObjectMetadata {}
163- crd .SetGroupVersionKind (extv1 .SchemeGroupVersion .WithKind ("CustomResourceDefinition" ))
164- crd .Name = drClusterConfigCRDName
165- if err := r .Client .Get (ctx , client .ObjectKeyFromObject (crd ), crd ); client .IgnoreNotFound (err ) != nil {
166- r .log .Error (err , "Failed to get CRD" , "CRD" , drClusterConfigCRDName )
167- return reconcile.Result {}, err
168- }
169- utils .AssertEqual (r .AvailableCrds [drClusterConfigCRDName ], crd .UID != "" , utils .ExitCodeThatShouldRestartTheProcess )
170-
171146 // Fetch the StorageClaim instance
172147 r .storageClaim = & v1alpha1.StorageClaim {}
173148 r .storageClaim .Name = req .Name
@@ -424,6 +399,30 @@ func (r *StorageClaimReconciler) reconcilePhases() (reconcile.Result, error) {
424399 if err != nil {
425400 return reconcile.Result {}, fmt .Errorf ("failed to create or update VolumeSnapshotClass: %s" , err )
426401 }
402+ case "VolumeReplicationClass" :
403+ vrc := & replicationv1alpha1.VolumeReplicationClass {}
404+ vrc .Name = r .storageClaim .Name
405+ if strings .Contains (resource .Name , "flatten" ) {
406+ vrc .Name = fmt .Sprintf ("%s-flatten" , r .storageClaim .Name )
407+ }
408+ err := utils .CreateOrReplace (r .ctx , r .Client , vrc , func () error {
409+ if err := r .own (vrc ); err != nil {
410+ return fmt .Errorf ("failed to own VolumeReplicationClass resource: %v" , err )
411+ }
412+ if err := json .Unmarshal (resource .Data , & vrc .Spec ); err != nil {
413+ return fmt .Errorf ("failed to unmarshall VolumeReplicationClass spec: %v" , err )
414+ }
415+ vrc .Spec .Parameters ["replication.storage.openshift.io/replication-secret-namespace" ] = r .OperatorNamespace
416+
417+ utils .AddLabels (vrc , resource .Labels )
418+ utils .AddAnnotations (vrc , resource .Annotations )
419+
420+ return nil
421+ })
422+ if err != nil {
423+ return reconcile.Result {}, fmt .Errorf ("failed to create or update VolumeReplicationClass: %s" , err )
424+ }
425+
427426 case "ClientProfile" :
428427 clientProfile := & csiopv1a1.ClientProfile {}
429428 clientProfile .Name = r .storageClaimHash
![openshift-merge-bot[bot]](https://avatars.githubusercontent.com/in/412865?v=4&size=40){kind=avatar}
0 commit comments