Skip to content

volsync: Add MoverConfig to local ReplicationSource #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pruthvitd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

volsync: Add MoverConfig to local ReplicationSource #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 42 additions & 5 deletions internal/controller/volsync/vshandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,18 @@ func (v *VSHandler) GetOwner() metav1.Object {
return v.owner
}

func (v *VSHandler) GetMoverConfigForPVC(pvcName, pvcNamespace string) *ramendrv1alpha1.MoverConfig {
if len(v.moverConfig) > 0 {
for _, mc := range v.moverConfig {
if mc.PVCName == pvcName && mc.PVCNameSpace == pvcNamespace {
return &mc
}
}
}

return nil
}

func (v *VSHandler) SetWorkloadStatus(status string) {
v.workloadStatus = status
}
Expand Down Expand Up @@ -2025,8 +2037,9 @@ func (v *VSHandler) rollbackToLastSnapshot(rdSpec ramendrv1alpha1.VolSyncReplica

pskSecretName := GetVolSyncPSKSecretNameFromVRGName(v.owner.GetName())

moverConfig := v.GetMoverConfigForPVC(rdSpec.ProtectedPVC.Name, rdSpec.ProtectedPVC.Namespace)
// Create localRD and localRS. The latest snapshot of the main RD will be used for the rollback
lrd, lrs, err := v.reconcileLocalReplication(rd, rdSpec, &snapshotRef, pskSecretName, v.log)
lrd, lrs, err := v.reconcileLocalReplication(rd, rdSpec, &snapshotRef, pskSecretName, moverConfig, v.log)
if err != nil {
return err
}
Expand Down Expand Up @@ -2550,15 +2563,18 @@ func ValidateObjectExists(ctx context.Context, c client.Client, obj client.Objec
func (v *VSHandler) reconcileLocalReplication(rd *volsyncv1alpha1.ReplicationDestination,
rdSpec ramendrv1alpha1.VolSyncReplicationDestinationSpec,
snapshotRef *corev1.TypedLocalObjectReference,
pskSecretName string, l logr.Logger) (*volsyncv1alpha1.ReplicationDestination,
pskSecretName string,
moverConfigSpec *ramendrv1alpha1.MoverConfig,
l logr.Logger) (*volsyncv1alpha1.ReplicationDestination,
*volsyncv1alpha1.ReplicationSource, error,
) {
lrd, err := v.reconcileLocalRD(rdSpec, pskSecretName)
lrd, err := v.reconcileLocalRD(rdSpec, pskSecretName, moverConfigSpec)
if lrd == nil || err != nil {
return nil, nil, fmt.Errorf("failed to reconcile fully localRD (%w)", err)
}

lrs, err := v.reconcileLocalRS(rd, &rdSpec, snapshotRef, pskSecretName, *lrd.Status.RsyncTLS.Address)
lrs, err := v.reconcileLocalRS(rd, &rdSpec, snapshotRef, pskSecretName, *lrd.Status.RsyncTLS.Address,
moverConfigSpec)
if err != nil {
return lrd, nil, fmt.Errorf("failed to reconcile localRS (%w)", err)
}
Expand All @@ -2570,7 +2586,8 @@ func (v *VSHandler) reconcileLocalReplication(rd *volsyncv1alpha1.ReplicationDes

//nolint:funlen
func (v *VSHandler) reconcileLocalRD(rdSpec ramendrv1alpha1.VolSyncReplicationDestinationSpec,
pskSecretName string) (*volsyncv1alpha1.ReplicationDestination, error,
pskSecretName string,
moverConfigSpec *ramendrv1alpha1.MoverConfig) (*volsyncv1alpha1.ReplicationDestination, error,
) {
v.log.Info("Reconciling localRD", "rdSpec name", rdSpec.ProtectedPVC.Name)

Expand All @@ -2597,6 +2614,14 @@ func (v *VSHandler) reconcileLocalRD(rdSpec ramendrv1alpha1.VolSyncReplicationDe
pvcAccessModes = rdSpec.ProtectedPVC.AccessModes
}

moverConfig := &volsyncv1alpha1.MoverConfig{}
if moverConfigSpec != nil {
moverConfig = &volsyncv1alpha1.MoverConfig{
MoverSecurityContext: moverConfigSpec.MoverSecurityContext,
MoverServiceAccount: moverConfigSpec.MoverServiceAccount,
}
}

lrd.Spec.RsyncTLS = &volsyncv1alpha1.ReplicationDestinationRsyncTLSSpec{
ServiceType: &DefaultRsyncServiceType,
KeySecret: &pskSecretName,
Expand All @@ -2608,6 +2633,7 @@ func (v *VSHandler) reconcileLocalRD(rdSpec ramendrv1alpha1.VolSyncReplicationDe
AccessModes: pvcAccessModes,
DestinationPVC: &rdSpec.ProtectedPVC.Name,
},
MoverConfig: *moverConfig,
}

return nil
Expand All @@ -2632,6 +2658,7 @@ func (v *VSHandler) reconcileLocalRS(rd *volsyncv1alpha1.ReplicationDestination,
rdSpec *ramendrv1alpha1.VolSyncReplicationDestinationSpec,
snapshotRef *corev1.TypedLocalObjectReference,
pskSecretName, address string,
moverConfigSpec *ramendrv1alpha1.MoverConfig,
) (*volsyncv1alpha1.ReplicationSource, error,
) {
v.log.Info("Reconciling localRS", "RD", rd.GetName())
Expand Down Expand Up @@ -2663,13 +2690,23 @@ func (v *VSHandler) reconcileLocalRS(rd *volsyncv1alpha1.ReplicationDestination,
}

lrs.Spec.SourcePVC = pvc.GetName()

moverConfig := &volsyncv1alpha1.MoverConfig{}
if moverConfigSpec != nil {
moverConfig = &volsyncv1alpha1.MoverConfig{
MoverSecurityContext: moverConfigSpec.MoverSecurityContext,
MoverServiceAccount: moverConfigSpec.MoverServiceAccount,
}
}

lrs.Spec.RsyncTLS = &volsyncv1alpha1.ReplicationSourceRsyncTLSSpec{
KeySecret: &pskSecretName,
Address: &address,

ReplicationSourceVolumeOptions: volsyncv1alpha1.ReplicationSourceVolumeOptions{
CopyMethod: volsyncv1alpha1.CopyMethodDirect,
},
MoverConfig: *moverConfig,
}

return nil
Expand Down
Loading