🌱 Bump CAPI to v1.11 and k8s to v1.33 #5720

clebs · 2025-10-23T10:21:14Z

What type of PR is this?
/kind support

What this PR does / why we need it:
This PR bumps CAPI to v1.11.0, and k8s to v1.33.3.

Update all imports to v1beta2 types except for conditions staying in v1beta1.
Adapt source code to work with v1beta2 and deprecated conditions.
Manually update conversions.

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 #5593

Replaces #5624

Special notes for your reviewer:

Checklist:

Release note:

Bump CAPI to v1.11 and k8s to v1.33

k8s-ci-robot · 2025-10-23T10:21:22Z

Welcome @clebs!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2025-10-23T10:21:23Z

Hi @clebs. Thanks for your PR.

I'm waiting for a github.com member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

clebs · 2025-10-23T10:31:01Z

@richardcase This PR here based on @bryan-cox's: #5720

Changes:

Rebased the PR to main
Fixed missing/wrong go modules
Updated all imports to use the new v1beta2 API, except for conditions which stay on v1beta1
Adapted all the code to properly use the new types
Add adapters to use v1beta1.Conditions with v1beta1types
Manually fix converters for FailureDomains

Current state:

Code compiles
Generation fails because of manual conversions required
Working on linting issues

chrischdi · 2025-10-23T10:43:45Z

/ok-to-test

api/v1beta1/awscluster_types.go

api/v1beta2/awscluster_types.go

.golangci.yml

util/paused/paused.go

test/e2e/suites/managed/machine_deployment_helpers.go

controllers/awscluster_controller.go

controllers/awscluster_controller_test.go

raykrueger · 2025-10-23T14:53:58Z

test/e2e/data/e2e_eks_conf.yaml

Should we be bumping KUBERNETES_VERSION_MANAGEMENT and KUBERNETES_VERSION_UPGRADE_FROM to target 1.33 in this file?

pkg/cloud/services/ec2/instances.go

cnmcavoy

See my comment on the subnet filtering regression

api/v1beta1/awsclustertemplate_types.go

api/v1beta1/awsmachinetemplate_types.go

bootstrap/eks/controllers/eksconfig_controller.go

* rosa: deflake unit test * fixup

Signed-off-by: Borja Clemente <[email protected]>

clebs · 2025-11-19T19:30:51Z

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

clebs · 2025-11-19T20:47:47Z

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

k8s-ci-robot · 2025-11-20T00:28:57Z

@clebs: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-aws-e2e-eks-gc	`8596a85`	link	false	`/test pull-cluster-api-provider-aws-e2e-eks-gc`
pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts	`852783a`	link	false	`/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts`
pull-cluster-api-provider-aws-e2e-clusterclass	`648525f`	link	false	`/test pull-cluster-api-provider-aws-e2e-clusterclass`
pull-cluster-api-provider-aws-e2e	`4601e0d`	link	false	`/test pull-cluster-api-provider-aws-e2e`

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.

chrischdi · 2025-11-20T06:26:04Z

We currently still have failure on:

Unknown because we did not have a result for pull-cluster-api-provider-aws-e2e-eks (because the test takes >4h)

Trying to dig into the above two and after some fixes we should ensure to run all 3 jobs to check.

chrischdi · 2025-11-20T07:00:11Z

Doing some analysis on:

Both fail on the same test.

TL/DR: we should ignore this test for now.

Reason: This probably needs changes in CAPI because it is a racy test.

The test does changes to a cluster via topology
This leads to rollouts e.g. as in the failure on the MachineDeployment
- When doing changes it explicitly does not wait for the rollouts of machines to finish, because the scope of the test is testing propagation from topology to the ControlPlane / MachineDeployment level.
At the end it checks all Machines for Readyness with a hardcoded timeout of 5 minutes
- In our case the rollouts from the MachineDeployment related changes are still on-going and due to that not all Machines are Ready, e.g. because another one is in deletion or in creation

cc @damdo

I'll try to follow-up in CAPI and would propose to bring that back to CAPA in a follow-up PR.

We could decide to skip this test for now or keep it red in CI.

chrischdi · 2025-11-20T07:00:26Z

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

chrischdi · 2025-11-20T08:56:13Z

Note: I compared the diff before/after squash and looks good 👍

A fix for the above described issue is work in progress at kubernetes-sigs/cluster-api#13013
The only todo in CAPA will be to add a timeout configuration to our e2e yaml files with a higher timeout then 5 minutes for the specific spec.

/lgtm

k8s-ci-robot · 2025-11-20T08:56:20Z

LGTM label has been added.

Git tree hash: e7b123975da170b8d11e221d4cf3a7c46c8ad2e2

nrb · 2025-11-21T02:27:57Z

/approve

Thank you all so much for your effort here!

k8s-ci-robot · 2025-11-21T02:28:06Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nrb

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [nrb]

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

Add Conditions to AWSMachineTemplateStatus and update controller for CAPI v1.11 API changes. Squashed from 2 commits: - ffdf7db Fix review comments 4 - 6493363 rebase kubernetes-sigs#5720

…Template capacity (#5711) * feat: implement auto-population of AWSMachineTemplate capacity and nodeInfo Add AWSMachineTemplateReconciler to automatically populate capacity and node info fields by querying AWS EC2 API. This completes the autoscaling from zero implementation by ensuring the required metadata is available without manual configuration. Changes include: - Add NodeInfo struct with Architecture and OperatingSystem fields to AWSMachineTemplate status - Implement controller that queries EC2 API for instance type specifications - Auto-populate CPU, memory, pods, and ephemeral storage capacity - Auto-detect architecture (amd64/arm64) and OS (linux/windows) from AMI - Add conversion logic for backward compatibility with v1beta1 - Enable status subresource on AWSMachineTemplate CRD - Add comprehensive unit tests (351 lines) covering various scenarios - Add RBAC permissions for controller operations The controller automatically populates these fields when an AWSMachineTemplate is created or updated, eliminating the need for manual configuration and enabling Cluster Autoscaler to make informed scaling decisions from zero nodes. Related: https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20210310-opt-in-autoscaling-from-zero.md Squashed from 5 commits: - 9a92a43 Implement autoscaling from zero by auto-populating AWSMachineTemplate capacity - 86fe072 add AWSMachineTemplate NodeInfo - ddaf62c Fix review comments - 4ea52c8 Fix review comments 2 - b398ffc Fix review comments 3 * feat(api): add Conditions field and update for CAPI v1.11 Add Conditions to AWSMachineTemplateStatus and update controller for CAPI v1.11 API changes. Squashed from 2 commits: - ffdf7db Fix review comments 4 - 6493363 rebase #5720

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. labels Oct 23, 2025

k8s-ci-robot requested review from richardcase and serngawy October 23, 2025 10:21

k8s-ci-robot added needs-priority cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 23, 2025

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 23, 2025

clebs mentioned this pull request Oct 23, 2025

🌱 Bump CAPI to v1.11 and k8s to v1.33 #5624

Closed

5 tasks

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 23, 2025