From 59e89be613d3df4380cf6ec7a483e9d17e57871e Mon Sep 17 00:00:00 2001 From: youhangwang Date: Wed, 12 Jun 2024 10:14:24 +0800 Subject: [PATCH] change replicationsource name from cg to pvc name Signed-off-by: youhangwang --- controllers/cephfscg/volumegroupsourcehandler.go | 3 +-- controllers/replicationgroupsource_controller.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/controllers/cephfscg/volumegroupsourcehandler.go b/controllers/cephfscg/volumegroupsourcehandler.go index 02ff22ab4b..a4983e422b 100644 --- a/controllers/cephfscg/volumegroupsourcehandler.go +++ b/controllers/cephfscg/volumegroupsourcehandler.go @@ -25,7 +25,6 @@ import ( var ( VolumeGroupSnapshotNameFormat = "cephfscg-%s" RestorePVCinCGNameFormat = "cephfscg-%s" - ReplicationSourceNameFormat = "cephfscg-%s" SnapshotGroup = "snapshot.storage.k8s.io" SnapshotGroupKind = "VolumeSnapshot" ) @@ -387,7 +386,7 @@ func (h *volumeGroupSourceHandler) CreateOrUpdateReplicationSourceForRestoredPVC replicationSourceNamepspace := h.VolumeGroupSnapshotNamespace replicationSource := &volsyncv1alpha1.ReplicationSource{ ObjectMeta: metav1.ObjectMeta{ - Name: restoredPVC.RestoredPVCName, + Name: restoredPVC.SourcePVCName, Namespace: replicationSourceNamepspace, }, } diff --git a/controllers/replicationgroupsource_controller.go b/controllers/replicationgroupsource_controller.go index 58c5572621..af515119e1 100644 --- a/controllers/replicationgroupsource_controller.go +++ b/controllers/replicationgroupsource_controller.go @@ -40,7 +40,7 @@ At the end of each sync, VolumeGroupSnapshot, Restored PVC and ReplicationSource 2. VolumeGroupSnapshot Name = cephfscg- 3. Restored PVC Name = cephfscg- -4. ReplicationSource Name = cephfscg- +4. ReplicationSource Name = 5. ReplicationDestinationServiceName = volsync-rsync-tls-dst-..svc.clusterset.local 6. Volsync Secret Name = -vs-secret