-
Notifications
You must be signed in to change notification settings - Fork 1.5k
OCPBUGS-69734: Fix destroy bootstrap command for Azure #10212
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
OCPBUGS-69734: Fix destroy bootstrap command for Azure #10212
Conversation
|
@patrickdillon: This pull request references Jira Issue OCPBUGS-69734, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
Instructions 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 openshift-eng/jira-lifecycle-plugin repository. |
|
This made some changes to ASH CRDs, which I can't test locally right now. Will see how they go here... |
|
/jira refresh |
|
@patrickdillon: This pull request references Jira Issue OCPBUGS-69734, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: DetailsIn response to this:
Instructions 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 openshift-eng/jira-lifecycle-plugin repository. |
|
/lgtm |
|
/approve |
We have not been able to reliably automate the generation of the nutanix CRDs. Instead, download them from the release.
CAPZ filters ASO CRDs so it only includes a small subset of ASO CRDs. Prior to this commit, we were not filtering ASO CRDs, which leads to a bug when ASO and CAPZ create conflicting CRDs. By filtering the ASO CRDs in the same manner as CAPZ we can avoid the bug.
Bumps to v2.13 to be consistent with version used by CAPZ.
Regenerate Azure CRDs, after updating script to trim duplicate CRDs from ASO.
ae5fc25 to
e858af4
Compare
|
/test ? |
|
/test verify-cluster-api-manifests |
|
@patrickdillon: The following commands are available to trigger required jobs: The following commands are available to trigger optional jobs: Use DetailsIn response to this:
Instructions 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. |
|
@patrickdillon: The specified target(s) for The following commands are available to trigger optional jobs: Use DetailsIn response to this:
Instructions 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. |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jhixson74 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 |
|
pre-merge tested, command "./openshift-install destroy bootstrap" works well, all related resources are deleted with this command. /verified by jima |
|
@jinyunma: This PR has been marked as verified by DetailsIn response to this:
Instructions 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 openshift-eng/jira-lifecycle-plugin repository. |
|
@patrickdillon: The following tests failed, say
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. |
4044020
into
openshift:main
|
@patrickdillon: Jira Issue Verification Checks: Jira Issue OCPBUGS-69734 Jira Issue OCPBUGS-69734 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓 DetailsIn response to this:
Instructions 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 openshift-eng/jira-lifecycle-plugin repository. |
|
/cherry-pick release-4.21 |
|
@tthvo: Failed to get PR patch from GitHub. This PR will need to be manually cherrypicked. Error messagestatus code 406 not one of [200], body: {"message":"Sorry, the diff exceeded the maximum number of files (300). Consider using 'List pull requests files' API or locally cloning the repository instead.","errors":[{"resource":"PullRequest","field":"diff","code":"too_large"}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#list-pull-requests-files","status":"406"}DetailsIn response to this:
Instructions 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. |
|
Fix included in accepted release 4.22.0-0.nightly-2026-01-19-085729 |
This fixes a bug on Azure where when we run
openshift-install destroy bootstrap(after stopping the installer during an install) we get the error:The reason we are getting this error is because there are conflicting CRDs between the
azure-infrastructure-components.yamlfile andazureaso-infrastructure-components.yaml.CAPZ filters and includes ASO CRDs into its own CRDs:
https://github.com/kubernetes-sigs/cluster-api-provider-azure/blob/1d1291ce3d3b1982eb61cab0f0b381ff023ebda6/Makefile#L568-L577
The issue we are seeing is because CAPZ introduces additional CRDs that conflict with ASO CRDs. Specifically from the error the CRD
extensions.kubernetesconfiguration.azure.comis included in both the CAPZ and ASO CRDs, but the ASO CRD includes thev1api20241101storageversion which CAPZ does not.When wer run the installer, Azure CRDs are installed and then ASO CRDs are installed. Because the ASO CRD (which includes the extra version) is installed second, it works. But when we run
destroy bootstrapthe ASO CRDs are restored from the etcd backup, and when envtest tries to re-install the Azure CRDs they conflict and we get the error.The solution is to filter the ASO CRDs in the same manner as Azure. That way we can ensure the CRDs shared between the two components are compatible. In order to do this, we will need to use the existing
./hack/verify-capi-crds.shscript to generate ASO CRDs.This PR also fixes some outstanding issues with that script. Most notably generating Nutanix CRDs has been troublesome, so this moves to downloading Nutanix CRDs.
cc @jhixson74 @rna-afk @sadasu (N.B. we must now use this script for ASO CRDS)