Skip to content

[oadp-1.5] Check the NaBSL status and conditions before creating Velero Backup#284

Merged
openshift-merge-bot[bot] merged 4 commits into
migtools:oadp-1.5from
openshift-cherrypick-robot:cherry-pick-249-to-oadp-1.5
May 16, 2025
Merged

[oadp-1.5] Check the NaBSL status and conditions before creating Velero Backup#284
openshift-merge-bot[bot] merged 4 commits into
migtools:oadp-1.5from
openshift-cherrypick-robot:cherry-pick-249-to-oadp-1.5

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

@openshift-cherrypick-robot openshift-cherrypick-robot commented May 16, 2025

Fix for: OADP-6139

This is an automated cherry-pick of #249

/assign mpryc

mpryc added 3 commits May 16, 2025 09:54
Fixes migtools#246

Ensure the state of the NaBSL is satisfying the Backup operation,
in a case the admin redefined enforcement the NaBSL state was
correctly synced back from the enforcement, however we disallowed
real updated of the Velero BSL object causing NaBSL being in
not allowed state, however previous Velero BSL fully functional.

This logic fixes that issue.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
We should faily only when specific conditions are False,
not all of them.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
Remove conditions check for the NaBSL check prior to creating backup.
This is enough as the NaBSL must be in created state after satisfying
all the conditions.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@oadp-snyk
Copy link
Copy Markdown

oadp-snyk commented May 16, 2025

🎉 Snyk checks have passed. No issues have been found so far.

security/snyk check is complete. No issues have been found. (View Details)

license/snyk check is complete. No issues have been found. (View Details)

Update go.mod and go.sum to match the oadp-operator oadp-1.5 branch.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
@mpryc
Copy link
Copy Markdown
Collaborator

mpryc commented May 16, 2025

@shubham-pampattiwar pls review.

Copy link
Copy Markdown
Member

@shubham-pampattiwar shubham-pampattiwar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 16, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, shubham-pampattiwar, weshayutin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [shubham-pampattiwar]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot Bot merged commit d33eb4a into migtools:oadp-1.5 May 16, 2025
10 checks passed
@kaovilai kaovilai mentioned this pull request Jun 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants