[backplane-2.11] Update backplane-2.11 with recent changes from main #487
Conversation
Adds the restore status annotation to ICI CRs and also waits for the status to be added to resources that are created by a restore operation. Because the spec and status need to be set by two different API calls to the API server the controller needs to know when to wait for the status to be set before initializing the conditions. Initializing the conditions in a restore scenario can lead to a conflict where the restore fails and the old status doesn't get set. https://issues.redhat.com/browse/MGMT-22276
Previously if/when IBIO was upgraded to include changes to add backup labels the labels would not be added for resources referenced by already installed clusters. To allow for this, the controller now needs to get the ClusterDeployment earlier (to find the referenced resources). To allow the conditions to still be set as before in cases where the ClusterDeployment is missing or the reference is not set, Reconcile specifically does not return when ClusterDeployment can't be found in this new, earlier, getCD call error case. This also handles labeling created resources immediately by adding the backup label to them when they are created in the credentials package.
|
Important Review skippedAuto reviews are limited based on label configuration. 🚫 Review skipped — only excluded labels are configured. (1)
Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Comment |
openshift-ci
bot
added
the
approved
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: carbonin, gamli75 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@carbonin: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
3 participants
Normally I would just push these as a "fast-forward" but I'd rather see konflux run and pass in case there are any issues.
Included PRs are: