Fixup make bundle #1857 and add back safeguard from #1867

[lmiccini]

No description provided.

[github-actions]

OpenStackControlPlane CRD Size Report

Metric	Value
CRD JSON size	322325 bytes (315KB)
Base branch size	322325 bytes
Change	+0.00%
Status	yellow — growing

Threshold reference

Color	Range	Meaning
🟢 green	< 300KB	Comfortable
🟡 yellow	300–400KB	Growing
🟠 orange	400–750KB	Concerning
🔴 red	> 750KB	Approaching 1.5MB etcd limit (cut in half to allow space for update)

[stuggi]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lmiccini, stuggi

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 [stuggi]

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

[softwarefactory-project-zuul]

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/3f45402f4ab84f73926d50b943cd8e90

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 14m 41s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 23m 52s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 32m 17s
❌ openstack-operator-tempest-multinode FAILURE in 22m 34s
✔️ openstack-operator-edpm-baremetal-minor-update SUCCESS in 2h 02m 19s

[stuggi]

recheck

[stuggi]

/retest