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

[bryan-cox]

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

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

Special notes for your reviewer:

Checklist:

• squashed commits
• includes documentation
• includes emoji in title
• adds unit tests
• adds or updates e2e tests

Release note:

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

[k8s-ci-robot]

[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 neolit123 for approval. For more information see the Code Review Process.

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

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]

Attached the issue number to this.

To ensure that this doesn't get merged too early before v2.9 is released.

/hold

[richardcase]

An initial scan and main points are:

• we need to use v1beta2 version of upstream CAPI instead of v1beta1
• there are duplicate import statements

Some other places that will also need to be updated with this change:

• The e2e files. Like the following (but not limited to):
  • https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/test/e2e/data/e2e_conf.yaml
  • https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/test/e2e/data/e2e_eks_conf.yaml
  • Test flavours to use v1beta2 of capi: https://github.com/kubernetes-sigs/cluster-api-provider-aws/tree/main/test/e2e/data/infrastructure-aws
• Some of the dot files like linter files: https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/.golangci-kal.yml
• Cloud build files will need to updated to use a 1.24 image: https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/cloudbuild.yaml
• Devbox config: https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/devbox.json
• Templates need to be update to use v1beta2 for CAPI: https://github.com/kubernetes-sigs/cluster-api-provider-aws/tree/main/templates
• Maybe the version file: https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/versions.mk

Also the following are useful:

make lint
make generate
make test
make managers

Ping me on slack or here if i can help in any way or if you have questions.

Thanks for taking on this 🎉

[richardcase]

We are also need to upgrade to v1beta2.

[richardcase]

This will be the same comment in a number of places so i won't repeat it for every instance.

[richardcase]

Duplicate import statements.

[richardcase]

There are a few instance of this in different files, won't call that out in each case.

[damdo]

Let's use the latest go 1.24 in this line

[nrb]

I notice that CAPI has a separate line for the go directive line, as seen here: https://github.com/kubernetes-sigs/cluster-api/blob/main/Makefile#L27

It might be worth adopting this. As I understand it, it's best practice to set your go directive to 1..0, especially if you're used as a library.

[damdo]

I think that's because they use it for verification reasons (see here)

They are still setting it manually in the go.mod, like we do https://github.com/kubernetes-sigs/cluster-api/blob/1d9f42a989db9c9d5da30633b68d520450bfa94e/go.mod#L3

[damdo]

That said it might be nice to add this verification, so that some other go.mod dependency change doesn't inadvertently bump it to a patch version, as we don't want that. And this would be caught early

[damdo]

@bryan-cox also on top of what @richardcase mentioned here, you can see #5447 for reference on more places to do bumps. Thanks 🎉

[k8s-ci-robot]

@bryan-cox: 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-build	f96b7ac	link	true	/test pull-cluster-api-provider-aws-build
pull-cluster-api-provider-aws-verify	f96b7ac	link	true	/test pull-cluster-api-provider-aws-verify
pull-cluster-api-provider-aws-e2e-blocking	f96b7ac	link	true	/test pull-cluster-api-provider-aws-e2e-blocking
pull-cluster-api-provider-aws-build-docker	f96b7ac	link	true	/test pull-cluster-api-provider-aws-build-docker
pull-cluster-api-provider-aws-test	f96b7ac	link	true	/test pull-cluster-api-provider-aws-test

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.