track replsetname in status

Signed-off-by: Mayank Shah <mayank.shah@percona.com>

Author: mayankshah1607

config/crd/bases/psmdb.percona.com_perconaservermongodbbackups.yaml

@@ -261,7 +261,7 @@ spec:
               snapshots:
                 items:
                   properties:
-                    nodeName:
+                    replsetName:
                       type: string
                     snapshotName:
                       type: string

config/crd/bases/psmdb.percona.com_perconaservermongodbrestores.yaml

@@ -219,7 +219,7 @@ spec:
                   snapshots:
                     items:
                       properties:
-                        nodeName:
+                        replsetName:
                           type: string
                         snapshotName:
                           type: string

deploy/bundle.yaml

@@ -265,7 +265,7 @@ spec:
               snapshots:
                 items:
                   properties:
-                    nodeName:
+                    replsetName:
                       type: string
                     snapshotName:
                       type: string
@@ -512,7 +512,7 @@ spec:
                   snapshots:
                     items:
                       properties:
-                        nodeName:
+                        replsetName:
                           type: string
                         snapshotName:
                           type: string
@@ -26736,7 +26736,7 @@ spec:
       serviceAccountName: percona-server-mongodb-operator
       containers:
         - name: percona-server-mongodb-operator
-          image: asia-south1-docker.pkg.dev/cloud-dev-112233/mayankshah/psmdb-operator:K8SPSMDB-1363
+          image: perconalab/percona-server-mongodb-operator:main
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3

deploy/crd.yaml

@@ -265,7 +265,7 @@ spec:
               snapshots:
                 items:
                   properties:
-                    nodeName:
+                    replsetName:
                       type: string
                     snapshotName:
                       type: string
@@ -512,7 +512,7 @@ spec:
                   snapshots:
                     items:
                       properties:
-                        nodeName:
+                        replsetName:
                           type: string
                         snapshotName:
                           type: string

deploy/cw-bundle.yaml

@@ -265,7 +265,7 @@ spec:
               snapshots:
                 items:
                   properties:
-                    nodeName:
+                    replsetName:
                       type: string
                     snapshotName:
                       type: string
@@ -512,7 +512,7 @@ spec:
                   snapshots:
                     items:
                       properties:
-                        nodeName:
+                        replsetName:
                           type: string
                         snapshotName:
                           type: string

e2e-tests/version-service/conf/crd.yaml

@@ -265,7 +265,7 @@ spec:
               snapshots:
                 items:
                   properties:
-                    nodeName:
+                    replsetName:
                       type: string
                     snapshotName:
                       type: string
@@ -512,7 +512,7 @@ spec:
                   snapshots:
                     items:
                       properties:
-                        nodeName:
+                        replsetName:
                           type: string
                         snapshotName:
                           type: string

pkg/apis/psmdb/v1/perconaservermongodbbackup_types.go

@@ -55,7 +55,7 @@ type PerconaServerMongoDBBackupStatus struct {
 	PBMname      string                       `json:"pbmName,omitempty"`
 	Size         string                       `json:"size,omitempty"`
 
-	Snapshots []SnapshotInfo `json:"snapshots,omitempty"`
+	Snapshots SnapshotInfos `json:"snapshots,omitempty"`
 
 	// Deprecated: Use PBMPods instead
 	PBMPod  string            `json:"pbmPod,omitempty"`
@@ -69,11 +69,22 @@ type PerconaServerMongoDBBackupStatus struct {
 	LatestRestorableTime *metav1.Time `json:"latestRestorableTime,omitempty"`
 }
 
+type SnapshotInfos []SnapshotInfo
+
 type SnapshotInfo struct {
-	NodeName     string `json:"nodeName,omitempty"`
+	ReplsetName  string `json:"replsetName,omitempty"`
 	SnapshotName string `json:"snapshotName,omitempty"`
 }
 
+func (s SnapshotInfos) GetSnapshotInfo(replsetName string) *SnapshotInfo {
+	for _, info := range s {
+		if info.ReplsetName == replsetName {
+			return &info
+		}
+	}
+	return nil
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // PerconaServerMongoDBBackup is the Schema for the perconaservermongodbbackups API

pkg/controller/perconaservermongodbbackup/snapshot.go

@@ -87,12 +87,13 @@ func (b *snapshotBackups) Start(ctx context.Context, k8sclient client.Client, cl
 func (b *snapshotBackups) reconcileSnapshot(
 	ctx context.Context,
 	cl client.Client,
+	rsName string,
 	pvc string,
 	bcp *api.PerconaServerMongoDBBackup,
 ) (*volumesnapshotv1.VolumeSnapshot, error) {
 	volumeSnapshot := &volumesnapshotv1.VolumeSnapshot{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      naming.VolumeSnapshotName(bcp, pvc),
+			Name:      naming.VolumeSnapshotName(bcp, rsName),
 			Namespace: bcp.GetNamespace(),
 		},
 	}
@@ -150,7 +151,7 @@ func (b *snapshotBackups) reconcileSnapshots(
 
 		// ensure snapshot is created.
 		pvcName := config.MongodDataVolClaimName + "-" + podName
-		snapshot, err := b.reconcileSnapshot(ctx, cl, pvcName, bcp)
+		snapshot, err := b.reconcileSnapshot(ctx, cl, rs.Name, pvcName, bcp)
 		if err != nil {
 			return false, nil, errors.Wrap(err, "reconcile snapshot")
 		}
@@ -165,7 +166,7 @@ func (b *snapshotBackups) reconcileSnapshots(
 			return false, nil, errors.Errorf("snapshot error: %s", ptr.Deref(snapshot.Status.Error.Message, ""))
 		}
 		snapshots = append(snapshots, api.SnapshotInfo{
-			NodeName:     rs.Node,
+			ReplsetName:  rs.Name,
 			SnapshotName: snapshot.GetName(),
 		})
 	}

pkg/naming/naming.go

@@ -85,6 +85,6 @@ func PBMHookScriptConfigMapName(cr *psmdbv1.PerconaServerMongoDB) string {
 	return fmt.Sprintf("%s-pbm-hookscript", cr.Name)
 }
 
-func VolumeSnapshotName(bcp *psmdbv1.PerconaServerMongoDBBackup, pvc string) string {
-	return fmt.Sprintf("%s-%s", bcp.Name, pvc)
+func VolumeSnapshotName(bcp *psmdbv1.PerconaServerMongoDBBackup, rsName string) string {
+	return fmt.Sprintf("%s-%s", bcp.Name, rsName)
 }