[breaking][deps] Upgrade to CAPI v1.11#861
Merged
AshleyDumaine merged 14 commits intomainfrom Sep 24, 2025
Merged
Conversation
c484da9 to
07dd8d3
Compare
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #861 +/- ##
==========================================
- Coverage 66.20% 65.97% -0.24%
==========================================
Files 71 71
Lines 7963 7959 -4
==========================================
- Hits 5272 5251 -21
- Misses 2391 2406 +15
- Partials 300 302 +2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
b74a787 to
4108d73
Compare
db4ffdc to
21620de
Compare
21620de to
20e42c5
Compare
864ed22 to
bbc7a05
Compare
…sourceSet strategies, only ApplyOnce
…r clusterctl version needed, bump contract in metadata necessary to use CAPI v1.11.X, bump clusterctl to 1.11 to use CAPI 1.11.X / v1beta2 resources
…tl for Tilt to prevent a hang on cert-manager
eljohnson92
approved these changes
Sep 24, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
To keep our dependencies up-to-date, we need to bump CAPI, but that involves some breaking changes (see https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.11.0)
Notably:
ClusterResourceSetno longer acceptsReconcilefor a strategy.ApplyOnceis the only option.This has been updated in the templates.
ControlPlaneEndpointfor the<Infraprovider>ClusterSpecnow requires at least one property (e.g.port: 6443).The tests have been updated accordingly, no change is needed on our templates.
InfrastructureRefon the<Infraprovider>ClusterSpecand<Infraprovider>MachineSpechas changed to bev1beta2.ContractVersionedObjectReferenceinstead ofcorev1.ObjectReference.The tests have been updated accordingly, no change is needed on our templates.
Event reasons have changed w/o proper deprecation first:
Special notes for the reviewer:
If trying to test the upgrade path for this: upgrading the CAPI/CAPBK providers via
make local-deploywill not work if you want to test this locally with an existing cluster.clusterctl upgrade planis what to use, but this also will not work if using capi-operator to set up the management cluster which we have been doing for some time now (clusterctl initwould be needed for that which this PR sets as the default for tilt).In other words, we might be blocked on testing the upgrade path until capi-operator adds support for CAPI v1.11 and cuts a new release.
Other notes:
Looks like nix is out of date for clusterctl, as of writing I'm seeing it only at v1.10.4: https://mynixos.com/nixpkgs/package/clusterctl
We need v1.11.0 or higher to use the v1beta2 CAPI CRDs if using clusterctl in devbox to set up a cluster. I don’t usually use devbox, but something to be aware of.
See also https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.1/docs/book/src/developer/providers/migrations/v1.10-to-v1.11.md for understanding the new changes is CAPI
Tilt now defaults to installing the CAPI providers on the KIND cluster via clusterctl since the capi-operator is not yet updated to support CAPI v1.11.X. The capi-operator method is still supported but requires setting
export USE_CAPI_OPERATOR="true"if desired.Updating the templates to use the v1beta2 CAPI/Kubeadm resources will be handled in a follow-up PR.
TODOs: