-
Notifications
You must be signed in to change notification settings - Fork 275
🌱 Update to Kubernetes v1.33.2 and cluster-api v1.11 #2611
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
base: main
Are you sure you want to change the base?
Conversation
❌ Deploy Preview for kubernetes-sigs-cluster-api-openstack failed. Why did it fail? →
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
ac118fe
to
27b703f
Compare
430982a
to
5890737
Compare
/hold cluster-api v1.10.3 still needs apimachinery v0.32.3. The bump has been made on the main branch, and we have to wait for them to cut a release. |
5890737
to
df419e5
Compare
Sounds like this is going to be the path of least resistance. Do you think it's worth a separate PR to bump to v1beta2 objects? |
It looks like v1beta2 was introduced in capi v1.11: https://github.com/kubernetes-sigs/cluster-api/tree/v1.10.3/api |
[EDIT] this was a long question that is not necessary any more |
@mdbooth In the end I think that the best solution would be for cluster-api to continue to provide the v1beta1 util functions we need. I am proposing it here: kubernetes-sigs/cluster-api#12441 This PR temporarily uses my fork of cluster-api to test the potential result. |
* Use Go v1.24.4 * Replace import path "sigs.k8s.io/cluster-api/api/v1beta1" with "sigs.k8s.io/cluster-api/api/core/v1beta1" * Replace import path "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1" with "sigs.k8s.io/cluster-api/api/ipam/v1beta1" * Replace import path "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" with "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta1" * Replace import path "sigs.k8s.io/cluster-api/hack/tools/release" with "sigs.k8s.io/cluster-api/hack/tools/release/notes" * Replace import path "sigs.k8s.io/cluster-api/utils/patch" with "sigs.k8s.io/cluster-api/utils/deprecated/v1beta1/patch" * Use util packages from cluster-api/util/deprecated/v1beta1 where necessary * make generate * Update API rule violations
@pierreprinetti: The following tests failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. 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. I understand the commands that are listed here. |
I’m starting to question what I committed to. |
The problem is we're trying to call |
@mdbooth Shall we move to v1beta2 manifests (based on cluster-api v1beta2), move controllers to v1beta2 and implement conversion to support v1beta1? |
I personally think this is the path of least resistance. If I'm honest it's what I originally assumed you were doing here. I don't think we'll need any conversions until we update the OpenStack resources (OpenStackMachine, OpenStackCluster) to the v1beta2 contract. That is: CAPO controllers will consume CAPI v1beta2 objects, but will themselves continue to publish infra objects conforming to CAPI v1beta1. We've been set a deadline of August next year to move to v1beta2, though, so we should probably get on that. |
What this PR does / why we need it:
Is it time for a kube bump yet?
Notes for the reviewers:
necessary
TODOs: