Adjust the Status of NonAdminBackup

Moves Status outside of Spec and adjusts this to reflect Velero Backup status as well additional Status when the Spec within NonAdminBackup is not defined. Signed-off-by: Michal Pryc <[email protected]>
migtools · Mar 6, 2024 · 70434b7 · 70434b7
1 parent 5bdd750
commit 70434b7
Show file tree

Hide file tree

Showing 7 changed files with 163 additions and 230 deletions.
diff --git a/api/v1alpha1/nonadminbackup_types.go b/api/v1alpha1/nonadminbackup_types.go
@@ -32,14 +32,12 @@ type NonAdminBackupSpec struct {
 
 	// BackupSpec defines the specification for a Velero backup.
 	BackupSpec *velerov1api.BackupSpec `json:"backupSpec,omitempty"`
-
-	// BackupStatus captures the current status of a Velero backup.
-	BackupStatus *velerov1api.BackupStatus `json:"backupStatus,omitempty"`
 }
 
 // NonAdminBackupStatus defines the observed state of NonAdminBackup
 type NonAdminBackupStatus struct {
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
+	// BackupStatus captures the current status of a Velero backup.
+	velerov1api.BackupStatus `json:",inline"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/nac.oadp.openshift.io_nonadminbackups.yaml b/config/crd/bases/nac.oadp.openshift.io_nonadminbackups.yaml
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/migi/oadp-nac-operator
-  newTag: v0.0.37
+  newTag: v0.0.39
diff --git a/internal/controller/common_nab.go b/internal/controller/common_nab.go
@@ -55,22 +55,37 @@ func GenerateVeleroBackupName(namespace, nabName string) string {
 
 func UpdateNonAdminBackupFromVeleroBackup(ctx context.Context, r client.Client, log logr.Logger, nab *nacv1alpha1.NonAdminBackup, veleroBackup *velerov1api.Backup) error {
 	// Make a copy of the current status for comparison
-	oldStatus := nab.Spec.BackupStatus.DeepCopy()
+	oldStatus := nab.Status.BackupStatus.DeepCopy()
 	oldSpec := nab.Spec.BackupSpec.DeepCopy()
 
 	// Update the status & spec
-	nab.Spec.BackupStatus = &veleroBackup.Status
-	nab.Spec.BackupSpec = &veleroBackup.Spec
+	// Copy the status from veleroBackup.Status to nab.Status
+	nab.Status = nacv1alpha1.NonAdminBackupStatus{
+		BackupStatus: veleroBackup.Status,
+	}
+
+	nab.Spec.BackupSpec = veleroBackup.Spec.DeepCopy()
 
-	if reflect.DeepEqual(oldStatus, nab.Spec.BackupStatus) && reflect.DeepEqual(oldSpec, nab.Spec.BackupSpec) {
-		// No change, no need to update
-		log.V(1).Info("NonAdminBackup status and spec is already up to date")
-		return nil
+	// Check if the spec has been updated
+	if !reflect.DeepEqual(oldSpec, nab.Spec.BackupSpec) {
+		if err := r.Update(ctx, nab); err != nil {
+			log.Error(err, "Failed to update NonAdminBackup Spec")
+			return err
+		}
+		log.V(1).Info("NonAdminBackup spec was updated")
+	} else {
+		log.V(1).Info("NonAdminBackup spec is already up to date")
 	}
 
-	if err := r.Update(ctx, nab); err != nil {
-		log.Error(err, "Failed to update NonAdminBackup")
-		return err
+	// Check if the status has been updated
+	if !reflect.DeepEqual(oldStatus, nab.Status.BackupStatus) {
+		if err := r.Status().Update(ctx, nab); err != nil {
+			log.Error(err, "Failed to update NonAdminBackup Status")
+			return err
+		}
+		log.V(1).Info("NonAdminBackup status was updated")
+	} else {
+		log.V(1).Info("NonAdminBackup status is already up to date")
 	}
 
 	return nil

diff --git a/internal/controller/nonadminbackup_controller.go b/internal/controller/nonadminbackup_controller.go
@@ -82,6 +82,12 @@ func (r *NonAdminBackupReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 
 	if veleroBackupSpec == nil {
 		log.Error(err, "NonAdminBackup CR does not contain valid VeleroBackupSpec")
+		nab.Status.Phase = velerov1api.BackupPhaseFailedValidation
+		nab.Status.FailureReason = "NonAdminBackup CR does not contain valid VeleroBackupSpec"
+		if err := r.Status().Update(ctx, &nab); err != nil {
+			log.Error(err, "Failed to update NonAdminBackup Status")
+			return ctrl.Result{}, err
+		}
 		return ctrl.Result{}, nil
 	}
 

diff --git a/internal/controller/velerobackup_predicate.go b/internal/controller/velerobackup_predicate.go
@@ -31,14 +31,14 @@ func getBackupPredicateLogger(ctx context.Context, name, namespace string) logr.
 
 func (veleroBackupPredicate VeleroBackupPredicate) Create(ctx context.Context, evt event.CreateEvent) bool {
 	nameSpace := evt.Object.GetNamespace()
-	if nameSpace != veleroBackupPredicate.OadpVeleroNamespace {
-		return false
-	}
-
 	name := evt.Object.GetName()
 	log := getBackupPredicateLogger(ctx, name, nameSpace)
 	log.V(1).Info("Received Create VeleroBackupPredicate")
 
+	if nameSpace != veleroBackupPredicate.OadpVeleroNamespace {
+		return false
+	}
+
 	backup, ok := evt.Object.(*velerov1api.Backup)
 	if !ok {
 		// The event object is not a Backup, ignore it