K8SPSMDB-1344: Add size into backup status (#1939)

Co-authored-by: Viacheslav Sarzhan <[email protected]>

Author: egegunes

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

@@ -33,6 +33,10 @@ spec:
       jsonPath: .status.type
       name: Type
       type: string
+    - description: Backup size
+      jsonPath: .status.size
+      name: Size
+      type: string
     - description: Job status
       jsonPath: .status.state
       name: Status
@@ -169,6 +173,8 @@ spec:
                 required:
                 - bucket
                 type: object
+              size:
+                type: string
               start:
                 format: date-time
                 type: string

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

@@ -137,6 +137,8 @@ spec:
                     required:
                     - bucket
                     type: object
+                  size:
+                    type: string
                   start:
                     format: date-time
                     type: string

deploy/bundle.yaml

@@ -37,6 +37,10 @@ spec:
       jsonPath: .status.type
       name: Type
       type: string
+    - description: Backup size
+      jsonPath: .status.size
+      name: Size
+      type: string
     - description: Job status
       jsonPath: .status.state
       name: Status
@@ -173,6 +177,8 @@ spec:
                 required:
                 - bucket
                 type: object
+              size:
+                type: string
               start:
                 format: date-time
                 type: string
@@ -332,6 +338,8 @@ spec:
                     required:
                     - bucket
                     type: object
+                  size:
+                    type: string
                   start:
                     format: date-time
                     type: string

deploy/crd.yaml

@@ -37,6 +37,10 @@ spec:
       jsonPath: .status.type
       name: Type
       type: string
+    - description: Backup size
+      jsonPath: .status.size
+      name: Size
+      type: string
     - description: Job status
       jsonPath: .status.state
       name: Status
@@ -173,6 +177,8 @@ spec:
                 required:
                 - bucket
                 type: object
+              size:
+                type: string
               start:
                 format: date-time
                 type: string
@@ -332,6 +338,8 @@ spec:
                     required:
                     - bucket
                     type: object
+                  size:
+                    type: string
                   start:
                     format: date-time
                     type: string

deploy/cw-bundle.yaml

@@ -37,6 +37,10 @@ spec:
       jsonPath: .status.type
       name: Type
       type: string
+    - description: Backup size
+      jsonPath: .status.size
+      name: Size
+      type: string
     - description: Job status
       jsonPath: .status.state
       name: Status
@@ -173,6 +177,8 @@ spec:
                 required:
                 - bucket
                 type: object
+              size:
+                type: string
               start:
                 format: date-time
                 type: string
@@ -332,6 +338,8 @@ spec:
                     required:
                     - bucket
                     type: object
+                  size:
+                    type: string
                   start:
                     format: date-time
                     type: string

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

@@ -37,6 +37,10 @@ spec:
       jsonPath: .status.type
       name: Type
       type: string
+    - description: Backup size
+      jsonPath: .status.size
+      name: Size
+      type: string
     - description: Job status
       jsonPath: .status.state
       name: Status
@@ -173,6 +177,8 @@ spec:
                 required:
                 - bucket
                 type: object
+              size:
+                type: string
               start:
                 format: date-time
                 type: string
@@ -332,6 +338,8 @@ spec:
                     required:
                     - bucket
                     type: object
+                  size:
+                    type: string
                   start:
                     format: date-time
                     type: string

pkg/apis/psmdb/v1/perconaservermongodbbackup_types.go

@@ -48,6 +48,7 @@ type PerconaServerMongoDBBackupStatus struct {
 	Filesystem     *BackupStorageFilesystemSpec `json:"filesystem,omitempty"`
 	ReplsetNames   []string                     `json:"replsetNames,omitempty"`
 	PBMname        string                       `json:"pbmName,omitempty"`
+	Size           string                       `json:"size,omitempty"`
 
 	// Deprecated: Use PBMPods instead
 	PBMPod               string            `json:"pbmPod,omitempty"`
@@ -67,6 +68,7 @@ type PerconaServerMongoDBBackupStatus struct {
 // +kubebuilder:printcolumn:name="Storage",type=string,JSONPath=".spec.storageName",description="Storage name"
 // +kubebuilder:printcolumn:name="Destination",type=string,JSONPath=".status.destination",description="Backup destination"
 // +kubebuilder:printcolumn:name="Type",type=string,JSONPath=".status.type",description="Backup type"
+// +kubebuilder:printcolumn:name="Size",type=string,JSONPath=".status.size",description="Backup size"
 // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=".status.state",description="Job status"
 // +kubebuilder:printcolumn:name="Completed",type=date,JSONPath=".status.completed",description="Completed time"
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=".metadata.creationTimestamp",description="Created time"

pkg/controller/perconaservermongodbbackup/backup.go

@@ -16,6 +16,7 @@ import (
 	"github.com/percona/percona-backup-mongodb/pbm/ctrl"
 	"github.com/percona/percona-backup-mongodb/pbm/defs"
 	pbmErrors "github.com/percona/percona-backup-mongodb/pbm/errors"
+	"github.com/percona/percona-backup-mongodb/pbm/storage"
 
 	api "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
 	"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/backup"
@@ -192,6 +193,7 @@ func (b *Backup) Status(ctx context.Context, cr *api.PerconaServerMongoDBBackup)
 			status.Error = "incremental base backup not found"
 		}
 	case defs.StatusDone:
+		status.Size = storage.PrettySize(meta.Size)
 		status.State = api.BackupStateReady
 		status.CompletedAt = &metav1.Time{
 			Time: time.Unix(meta.LastTransitionTS, 0),