🌱 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:20Z

[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 ankitasw 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

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

chrischdi · 2025-11-17T11:39:08Z

Unrelated failures on these e2e's

/usr/local/bin/runner.sh: line 117: ./scripts/ci-e2e-eks-gc.sh: No such file or directory

pull-cluster-api-provider-aws-e2e-eks-gc:
- I think this job is currently fully broken (unrelated)

Boskos issue (retryable):

pull-cluster-api-provider-aws-e2e-clusterclass
pull-cluster-api-provider-aws-e2e-conformance
pull-cluster-api-provider-aws-e2e-eks

chrischdi · 2025-11-17T11:40:53Z

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

damdo · 2025-11-17T12:47:24Z

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

… use the new field name

damdo · 2025-11-17T14:37:17Z

@clebs Something else we'll need to fix for the pull-cluster-api-provider-aws-e2e to pass.
We've discussed this with @chrischdi and we think we know why this..

https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-aws/5720/pull-cluster-api-provider-aws-e2e/1990369409213927424#1:build-log.txt%3A3018-3036

  [FAILED] Timed out after 180.001s.
  Failed to create BootstrapConfigTemplate functional-test-ignition-fsobr4/functional-test-ignition-b3ec4v-md-unencrypted-userdata
  Expected success, but got an error:
      <*runtime.notRegisteredErr | 0xc000dd3560>: 
      no kind is registered for the type v1beta1.KubeadmConfigTemplate in scheme "pkg/runtime/scheme.go:110"
      {
          schemeName: "pkg/runtime/scheme.go:110",
          gvk: {Group: "", Version: "", Kind: ""},
          target: nil,
          t: <*reflect.rtype | 0x475e4a0>{
              t: {Size_: 0x1f8, PtrBytes: 0x1f8, Hash: 404245230, TFlag: 7, Align_: 8, FieldAlign_: 8, Kind_: 25, Equal: nil, GCData: 85, Str: 797726, PtrToThis: 15034336},
          },
      }
  In [It] at: /home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/machinedeployment_helpers.go:63 @ 11/17/25 12:30:36.726
  Full Stack Trace
    sigs.k8s.io/cluster-api/test/framework.CreateMachineDeployment({0x5406d78, 0x76eca60}, {{0x7fe2897c4fd8, 0xc00239a900}, 0xc002386708, {0x5439e98, 0xc001655a00}, {0x5439fb0, 0xc0022c8908}})
    	/home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/machinedeployment_helpers.go:63 +0x47e
    sigs.k8s.io/cluster-api-provider-aws/v2/test/e2e/suites/unmanaged.init.func8.12.1()
    	/home/prow/go/src/sigs.k8s.io/cluster-api-provider-aws/test/e2e/suites/unmanaged/unmanaged_functional_test.go:921 +0xa67

chrischdi · 2025-11-17T14:38:24Z

@clebs Something else we'll need to fix for the pull-cluster-api-provider-aws-e2e to pass. We've discussed this with @chrischdi and we think we know why this..

prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-aws/5720/pull-cluster-api-provider-aws-e2e/1990369409213927424#1:build-log.txt%3A3018-3036

  [FAILED] Timed out after 180.001s.
  Failed to create BootstrapConfigTemplate functional-test-ignition-fsobr4/functional-test-ignition-b3ec4v-md-unencrypted-userdata
  Expected success, but got an error:
      <*runtime.notRegisteredErr | 0xc000dd3560>: 
      no kind is registered for the type v1beta1.KubeadmConfigTemplate in scheme "pkg/runtime/scheme.go:110"
      {
          schemeName: "pkg/runtime/scheme.go:110",
          gvk: {Group: "", Version: "", Kind: ""},
          target: nil,
          t: <*reflect.rtype | 0x475e4a0>{
              t: {Size_: 0x1f8, PtrBytes: 0x1f8, Hash: 404245230, TFlag: 7, Align_: 8, FieldAlign_: 8, Kind_: 25, Equal: nil, GCData: 85, Str: 797726, PtrToThis: 15034336},
          },
      }
  In [It] at: /home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/machinedeployment_helpers.go:63 @ 11/17/25 12:30:36.726
  Full Stack Trace
    sigs.k8s.io/cluster-api/test/framework.CreateMachineDeployment({0x5406d78, 0x76eca60}, {{0x7fe2897c4fd8, 0xc00239a900}, 0xc002386708, {0x5439e98, 0xc001655a00}, {0x5439fb0, 0xc0022c8908}})
    	/home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/machinedeployment_helpers.go:63 +0x47e
    sigs.k8s.io/cluster-api-provider-aws/v2/test/e2e/suites/unmanaged.init.func8.12.1()
    	/home/prow/go/src/sigs.k8s.io/cluster-api-provider-aws/test/e2e/suites/unmanaged/unmanaged_functional_test.go:921 +0xa67

xref: clebs#1

This should be because we still use v1beta1 in our e2e test templates.

I'd propose to add the scheme to our clients (as in xref: clebs#1 ) and have a follow up to migrate the templates to v1beta2.

CAPI Bump fixes part 1

k8s-ci-robot · 2025-11-17T14:45:29Z

Adding label do-not-merge/contains-merge-commits because PR contains merge commits, which are not allowed in this repository.
Use git rebase to reapply your commits on top of the target branch. Detailed instructions for doing so can be found 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.

chrischdi · 2025-11-17T14:46:21Z

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-clusterclass
/test pull-cluster-api-provider-aws-e2e-conformance
/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts
/test pull-cluster-api-provider-aws-e2e-eks

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

nrb · 2025-11-17T15:35:34Z

/label tide/merge-method-squash

damdo · 2025-11-17T16:01:14Z

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

damdo · 2025-11-17T16:01:29Z

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-clusterclass
/test pull-cluster-api-provider-aws-e2e-conformance
/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts
/test pull-cluster-api-provider-aws-e2e-eks

damdo · 2025-11-17T17:16:26Z

@clebs @chrischdi Next error:

https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-aws/5720/pull-cluster-api-provider-aws-e2e/1990450237566619648#1:build-log.txt%3A1083-1100


  [FAILED] failed to run clusterctl upgrade
  Unexpected error:
      <*errors.fundamental | 0xc003a8c4b0>: 
      current version of clusterctl could only upgrade the core provider to v1beta2 contract version, requested v1beta1
      {
          msg: "current version of clusterctl could only upgrade the core provider to v1beta2 contract version, requested v1beta1",
          stack: [0x3aa4970, 0x3aa39e5, 0x3ac2b64, 0x3bafbd3, 0x3bb49e8, 0x3d9b6f0, 0x86eb93, 0x882abb, 0x4841e1],
      }
  occurred
  In [It] at: /home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/clusterctl/client.go:202 @ 11/17/25 16:30:21.502
  Full Stack Trace
    sigs.k8s.io/cluster-api/test/framework/clusterctl.Upgrade({_, _}, {{0xc0031343c0, 0x3e}, {0xc00129a080, 0x31}, 0x0, {0xc003c9c1b0, 0x25}, {0xc0048fa4c8, ...}, ...})
    	/home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/clusterctl/client.go:202 +0x649
    sigs.k8s.io/cluster-api/test/framework/clusterctl.UpgradeManagementClusterAndWait({_, _}, {{0x542dff8, 0xc0001f87e0}, {0xc00129a080, 0x31}, 0x0, {0x0, 0x0}, {0x0, ...}, ...}, ...)
    	/home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/clusterctl/clusterctl_helpers.go:226 +0x848
    sigs.k8s.io/cluster-api-provider-aws/v2/test/e2e/suites/unmanaged.init.func6.3.1()
    	/home/prow/go/src/sigs.k8s.io/cluster-api-provider-aws/test/e2e/suites/unmanaged/unmanaged_classic_elb_upgrade_test.go:201 +0x1690

damdo · 2025-11-17T17:53:11Z

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

damdo · 2025-11-17T17:54:43Z

@chrischdi looks like now we are seeing failed to get field "spec.machineTemplate.nodeDrainTimeoutSeconds" is this expected?

https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-aws/5720/pull-cluster-api-provider-aws-e2e-clusterclass/1990450237252046848#1:build-log.txt%3A2059

test/e2e/suites/unmanaged/unmanaged_CAPI_clusterclass_test.go

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

YuLi517 · 2025-11-18T01:09:59Z

As this PR blocked PR #5711, could we get it merged soon? cc: @LiangquanLi930

chrischdi · 2025-11-18T07:19:24Z

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-clusterclass
/test pull-cluster-api-provider-aws-e2e-conformance
/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts
/test pull-cluster-api-provider-aws-e2e-eks

Have to check the other failures at https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-aws/5720/pull-cluster-api-provider-aws-e2e/1990450237566619648 (besides the timeout field stuff)

damdo · 2025-11-18T08:21:07Z

As this PR blocked PR #5711, could we get it merged soon? cc: @LiangquanLi930

@YuLi517 The plan is to do that as soon as all the tests are passing. Thanks

chrischdi · 2025-11-18T08:57:24Z

One more round of fixes :-)

https://github.com/clebs/cluster-api-provider-aws/pull/2/files

e2e: fix contract for CAPI

chrischdi · 2025-11-18T08:59:20Z

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-clusterclass
/test pull-cluster-api-provider-aws-e2e-conformance
/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts
/test pull-cluster-api-provider-aws-e2e-eks

k8s-ci-robot · 2025-11-18T09:01:14Z

@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	`260c43b`	link	false	`/test pull-cluster-api-provider-aws-e2e`
pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts	`260c43b`	link	false	`/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts`
pull-cluster-api-provider-aws-e2e-eks	`260c43b`	link	false	`/test pull-cluster-api-provider-aws-e2e-eks`
pull-cluster-api-provider-aws-e2e-clusterclass	`260c43b`	link	false	`/test pull-cluster-api-provider-aws-e2e-clusterclass`

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.

damdo · 2025-11-18T09:40:41Z

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

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