🌱 Bump CAPI to v1.12.2, k8s to v1.34 and controller-runtime to v0.22.5 by clebs · Pull Request #5857 · kubernetes-sigs/cluster-api-provider-aws

clebs · 2026-02-03T16:01:20Z

What type of PR is this?
/kind support

What this PR does / why we need it:
This PR bumps CAPI to v1.12.2 and with it, k8s to v1.34.3 and controller-runtime to v0.22.5.
Needed to be up to date with CAPI releases.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #5834

Special notes for your reviewer:
None

TODO
This bump is affected by the following issues which needs to be addressed before we can successfully see this bump passing regular e2es:

Checklist:

Release note:

Bump CAPI to v1.12.2, k8s to v1.34 and controller-runtime to v0.22.5

k8s-ci-robot · 2026-02-03T16:01:30Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign justinsb for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

OWNERS

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

richardcase

@clebs - we'll also need to update the CAPI version in other places like the e2e config files. Like this: https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/test/e2e/data/e2e_conf.yaml#L30

clebs · 2026-02-04T14:49:56Z

/ok-to-test

clebs · 2026-02-04T15:09:49Z

@clebs - we'll also need to update the CAPI version in other places like the e2e config files. Like this: https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/test/e2e/data/e2e_conf.yaml#L30

@richardcase I have updated CAPI and k8s versions based on previous bump PRs:

Updated e2e test CAPI version and upgrade from/to k8s versions.
Updated envtest to be in sync with controller-runtime.

PTAL!

clebs · 2026-02-05T07:32:42Z

/retest

clebs · 2026-02-05T15:36:28Z

/retest

damdo · 2026-03-06T11:04:19Z

/test pull-cluster-api-provider-aws-e2e-blocking

clebs · 2026-03-08T21:14:05Z

/test pull-cluster-api-provider-aws-e2e-blocking

damdo · 2026-03-08T21:17:29Z

Hey @clebs we'll need #5869 in first I think, before seeing pull-cluster-api-provider-aws-e2e-blocking hopefully go green

damdo · 2026-03-09T19:36:29Z

@clebs this will need rebasing, then we can retest and see

In CAPI v1.12 (v1beta2), the Cluster topology field changed from `spec.topology.class` (string) to `spec.topology.classRef.name`, and ClusterClass template references changed from `ref` (with apiVersion, kind, name) to `templateRef` (with kind, name only). Update all ClusterClass kustomize source templates to match the v1beta2 schema. Signed-off-by: Damiano Donati <damiano.donati@gmail.com>

In v1beta2, MachineDeploymentClass has bootstrap and infrastructure directly under the class entry, without the intermediate template wrapper that existed in v1beta1. Signed-off-by: Damiano Donati <damiano.donati@gmail.com>

The v1beta2 ClusterClassTemplateReference requires apiVersion in addition to kind and name. Signed-off-by: Damiano Donati <damiano.donati@gmail.com>

Kubernetes v1.34.8 includes a kubeadm change (kubernetes/kubernetes#138957) that removes the kubeadm:apiserver-kubelet-client ClusterRoleBinding on join. Without the matching CAPI fix (cluster-api#13664, backported in v1.12.8), the KCP controller gets Forbidden when proxying to etcd through the API server, blocking the pre-terminate kcp-cleanup hook indefinitely during rolling upgrades. Signed-off-by: Damiano Donati <damiano.donati@gmail.com>

The Flatcar stable AMI has a 15 GB root snapshot, which is larger than the 10 GB rootVolume size inherited from the default template. This causes EC2 instance creation to fail with "root volume size (10) must be greater than or equal to snapshot size (15)". Bump rootVolume to 16 GB in the ignition control-plane and worker AMI patches. Signed-off-by: Damiano Donati <damiano.donati@gmail.com>

…overlays The external-vpc-clusterclass and self-hosted-clusterclass kustomize overlays target cluster.x-k8s.io/v1beta1 for their JSON patches, but the Cluster template was bumped to v1beta2. This caused the patches to silently not apply, so variables like vpcID and selfHosted were missing from the generated templates. Signed-off-by: Damiano Donati <damiano.donati@gmail.com>

Signed-off-by: Damiano Donati <damiano.donati@gmail.com>

Kubernetes v1.34.2 introduced a kubeadm change (kubernetes/kubeadm#3294) that removed the implicit load balancer health gate from the wait-control-plane phase. This causes intermittent kubeadm join failures when the control plane endpoint is not yet fully converged. A fix has been merged upstream (kubernetes/kubernetes#139667) and will be included in v1.34.9. Until that release is available, temporarily pin workload clusters to v1.34.1 (pre-regression, with a published AMI) to unblock the CAPI v1.12 bump. The management cluster and EKS e2e configs are not affected.

… regression Kubernetes v1.34.x has a kubeadm bug (kubernetes/kubernetes#139667) where GetConfigMapWithShortRetry's 350ms polling budget is bypassed by a 10s http.Client.Timeout, causing intermittent worker join failures when the NLB has not fully converged. The fix is merged upstream but not yet released. Switch workload clusters to v1.33.4 (pre-regression) to unblock the CAPI v1.12 bump. Update etcd and coredns upgrade versions to match. Signed-off-by: Damiano Donati <damiano.donati@gmail.com>

The eks-nodeadm-clusterclass template and test were removed in 551148e but references remained in e2e_eks_conf.yaml and helpers.go, causing the EKS e2e suite to fail in BeforeSuite. Signed-off-by: Damiano Donati <damiano.donati@gmail.com>

Signed-off-by: Borja Clemente <borja.clemente@gmail.com>

clebs · 2026-06-26T08:25:21Z

/test pull-cluster-api-provider-aws-e2e-blocking pull-cluster-api-provider-aws-e2e pull-cluster-api-provider-aws-e2e-eks

damdo · 2026-06-26T10:06:21Z

/test pull-cluster-api-provider-aws-e2e-eks

Same unrelated flake from before, we can fix this in a follow up

richardcase · 2026-06-26T10:50:11Z

+
+	// DNSResolutionCheck configures the behavior for checking the load balancer DNS resolution.
+	// Set to "None" to disable the check.
+	// If omitted, the provider will pick a reasonable default which may change over time.


Not sure can or should say that we will change the default behaviour.

damdo · 2026-06-26T11:54:20Z

/test pull-cluster-api-provider-aws-e2e-eks

damdo · 2026-06-26T12:56:47Z

/test pull-cluster-api-provider-aws-e2e-eks

damdo · 2026-06-26T14:26:22Z

/lgtm

🎉

kubernetes-prow · 2026-06-26T14:26:30Z

LGTM label has been added.

Details

Git tree hash: 3547b546020f4afb6f9c7d00844fbbd28b448cd3

damdo · 2026-06-26T14:27:35Z

/unhold

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/support Categorizes issue or PR as a support question. needs-priority cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 3, 2026

k8s-ci-robot requested review from richardcase and serngawy February 3, 2026 16:01

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 3, 2026

richardcase requested changes Feb 3, 2026

View reviewed changes

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 4, 2026

k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Feb 4, 2026

clebs force-pushed the capi-1.12-bump branch 2 times, most recently from b6a0781 to b06184d Compare February 4, 2026 20:42

clebs mentioned this pull request Feb 10, 2026

🌱 Remove cloud-provider flag usage #5865

Merged

5 tasks

k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. do-not-merge/contains-merge-commits and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 2, 2026

clebs force-pushed the capi-1.12-bump branch from 3f8b452 to 16f9bf6 Compare March 4, 2026 09:35

k8s-ci-robot removed the do-not-merge/contains-merge-commits label Mar 4, 2026

clebs force-pushed the capi-1.12-bump branch from 16f9bf6 to da13c71 Compare March 4, 2026 09:38

clebs force-pushed the capi-1.12-bump branch from da13c71 to 5f7a840 Compare March 8, 2026 21:12

damdo and others added 11 commits June 26, 2026 09:35

fix(e2e): add apiVersion to ClusterClass templateRef fields

2b2eea7

The v1beta2 ClusterClassTemplateReference requires apiVersion in addition to kind and name. Signed-off-by: Damiano Donati <damiano.donati@gmail.com>

test(e2e): set kubeadm verbosity to 5 for e2e debugging

b0ffe49

Signed-off-by: Damiano Donati <damiano.donati@gmail.com>

chore(unit): Replace magic numbers with existing constants

0f5d67c

Signed-off-by: Borja Clemente <borja.clemente@gmail.com>

clebs force-pushed the capi-1.12-bump branch from 680feac to 0f5d67c Compare June 26, 2026 07:45

richardcase reviewed Jun 26, 2026

View reviewed changes

kubernetes-prow Bot assigned damdo Jun 26, 2026

kubernetes-prow Bot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 26, 2026

kubernetes-prow Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 26, 2026

kubernetes-prow Bot merged commit 6af87d2 into kubernetes-sigs:main Jun 26, 2026
19 checks passed

clebs deleted the capi-1.12-bump branch June 26, 2026 14:29

Uh oh!

Conversation

clebs commented Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Feb 3, 2026

Uh oh!

richardcase left a comment

Choose a reason for hiding this comment

Uh oh!

clebs commented Feb 4, 2026

Uh oh!

clebs commented Feb 4, 2026

Uh oh!

clebs commented Feb 5, 2026

Uh oh!

clebs commented Feb 5, 2026

Uh oh!

damdo commented Mar 6, 2026

Uh oh!

clebs commented Mar 8, 2026

Uh oh!

damdo commented Mar 8, 2026

Uh oh!

damdo commented Mar 9, 2026

Uh oh!

clebs commented Jun 26, 2026

Uh oh!

damdo commented Jun 26, 2026

Uh oh!

richardcase Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

damdo commented Jun 26, 2026

Uh oh!

damdo commented Jun 26, 2026

Uh oh!

damdo commented Jun 26, 2026

Uh oh!

kubernetes-prow Bot commented Jun 26, 2026

Uh oh!

damdo commented Jun 26, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

clebs commented Feb 3, 2026 •

edited

Loading