From d1a710ae91cca51b226c0ce9e269cdc4cc21dffe Mon Sep 17 00:00:00 2001 From: Michal Pryc Date: Wed, 6 Mar 2024 13:50:20 +0100 Subject: [PATCH] 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 --- config/manager/kustomization.yaml | 2 +- internal/common/function/function.go | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 1771d3e..4d98597 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: quay.io/konveyor/oadp-non-admin - newTag: latest + newTag: latest \ No newline at end of file diff --git a/internal/common/function/function.go b/internal/common/function/function.go index a8bc4f9..81bf037 100644 --- a/internal/common/function/function.go +++ b/internal/common/function/function.go @@ -262,8 +262,6 @@ func CheckVeleroBackupLabels(backup *velerov1api.Backup) bool { return exists && value == constant.ManagedByLabelValue } -// TODO not used - // GetNonAdminBackupFromVeleroBackup return referenced NonAdminBackup object from Velero Backup object, if no error occurs func GetNonAdminBackupFromVeleroBackup(ctx context.Context, clientInstance client.Client, backup *velerov1api.Backup) (*nacv1alpha1.NonAdminBackup, error) { // Check if the backup has the required annotations to identify the associated NonAdminBackup object