diff --git a/api/v1/objectstore_types.go b/api/v1/objectstore_types.go index 80c4742..75dcdad 100644 --- a/api/v1/objectstore_types.go +++ b/api/v1/objectstore_types.go @@ -73,8 +73,11 @@ type RecoveryWindow struct { // restored. FirstRecoverabilityPoint *metav1.Time `json:"firstRecoverabilityPoint,omitempty"` + // Deprecated: typo of lastSuccessfulBackupTime + LastSuccussfulBackupTime *metav1.Time `json:"lastSuccussfulBackupTime,omitempty"` + // The last successful backup time - LastSuccessfulBackupTime *metav1.Time `json:"lastSuccussfulBackupTime,omitempty"` + LastSuccessfulBackupTime *metav1.Time `json:"lastSuccessfulBackupTime,omitempty"` } // +kubebuilder:object:root=true diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go index 11fb2ae..58402fe 100644 --- a/api/v1/zz_generated.deepcopy.go +++ b/api/v1/zz_generated.deepcopy.go @@ -153,6 +153,10 @@ func (in *RecoveryWindow) DeepCopyInto(out *RecoveryWindow) { in, out := &in.FirstRecoverabilityPoint, &out.FirstRecoverabilityPoint *out = (*in).DeepCopy() } + if in.LastSuccussfulBackupTime != nil { + in, out := &in.LastSuccussfulBackupTime, &out.LastSuccussfulBackupTime + *out = (*in).DeepCopy() + } if in.LastSuccessfulBackupTime != nil { in, out := &in.LastSuccessfulBackupTime, &out.LastSuccessfulBackupTime *out = (*in).DeepCopy() diff --git a/config/crd/bases/barmancloud.cnpg.io_objectstores.yaml b/config/crd/bases/barmancloud.cnpg.io_objectstores.yaml index 6fb87b5..e6cfeb0 100644 --- a/config/crd/bases/barmancloud.cnpg.io_objectstores.yaml +++ b/config/crd/bases/barmancloud.cnpg.io_objectstores.yaml @@ -609,10 +609,14 @@ spec: restored. format: date-time type: string - lastSuccussfulBackupTime: + lastSuccessfulBackupTime: description: The last successful backup time format: date-time type: string + lastSuccussfulBackupTime: + description: 'Deprecated: typo of lastSuccessfulBackupTime' + format: date-time + type: string type: object description: ServerRecoveryWindow maps each server to its recovery window diff --git a/internal/cnpgi/instance/metrics_test.go b/internal/cnpgi/instance/metrics_test.go index 1841f2b..d285965 100644 --- a/internal/cnpgi/instance/metrics_test.go +++ b/internal/cnpgi/instance/metrics_test.go @@ -53,6 +53,7 @@ var _ = Describe("Metrics Collect method", func() { clusterName: { FirstRecoverabilityPoint: &firstRecoverabilityPoint, LastSuccessfulBackupTime: &lastSuccessfulBackupTime, + LastSuccussfulBackupTime: &lastSuccessfulBackupTime, }, }, }, diff --git a/internal/cnpgi/instance/recovery_window.go b/internal/cnpgi/instance/recovery_window.go index 8e3aea9..736138e 100644 --- a/internal/cnpgi/instance/recovery_window.go +++ b/internal/cnpgi/instance/recovery_window.go @@ -32,6 +32,7 @@ func updateRecoveryWindow( recoveryWindow := barmancloudv1.RecoveryWindow{ FirstRecoverabilityPoint: convertTime(backupList.GetFirstRecoverabilityPoint()), LastSuccessfulBackupTime: convertTime(backupList.GetLastSuccessfulBackupTime()), + LastSuccussfulBackupTime: convertTime(backupList.GetLastSuccessfulBackupTime()), } if objectStore.Status.ServerRecoveryWindow == nil {