[DNR][WIP] 🌱 Testing Timeout fix for CAPI v1.11 clusterclass-changes #5756

chrischdi · 2025-11-20T09:28:56Z

What type of PR is this?

/kind failing-test

What this PR does / why we need it:

Tests the CAPI PR:

🌱 e2e: use wait-machine-upgrade timeout in ClusterClassChanges tests to wait for machines to be ready cluster-api#13013

Via branch (based on v1.11.1, not CAPI main as the actual PR):

https://github.com/chrischdi/cluster-api/tree/tmp-capa-test-e2e-bump

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 #

Special notes for your reviewer:

Checklist:

Release note:

NONE

- Update core Kubernetes dependencies from v0.32.3 to v0.33.4: - k8s.io/api, k8s.io/apimachinery, k8s.io/client-go - k8s.io/apiserver, k8s.io/cli-runtime, k8s.io/kubectl - k8s.io/apiextensions-apiserver, k8s.io/component-base - Upgrade prometheus/client_golang from v1.19.1 to v1.22.0 - Update cel.dev/expr from v0.18.0 to v0.19.1 - Upgrade google/cel-go from v0.22.0 to v0.23.2 - Update golang.org/x/time from v0.8.0 to v0.9.0 - Upgrade gRPC from v1.67.3 to v1.68.1 - Update OpenTelemetry packages to v1.33.0 - Refresh k8s.io/utils and other indirect dependencies - Update kube-openapi and structured-merge-diff versions

- Upgrade cluster-api from v1.10.2 to v1.11.1 - Upgrade controller-runtime from v0.20.4 to v0.21.0 - Update various golang.org/x/* packages - Update testing dependencies (ginkgo, gomega) - Update OpenTelemetry and other indirect dependencies

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

- 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. Signed-off-by: Borja Clemente <[email protected]>

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

Introducing v1beta2 on public types is a breaking change so they have to stay in v1beta1. Internally though, migration to v1beta2 is happening (except for conditions). Signed-off-by: Borja Clemente <[email protected]>

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

Add rule to allow using deprecated v1beta1 CAPI APIs and removed linter comments everywhere. Signed-off-by: Borja Clemente <[email protected]>

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

… use the new field name

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

* rosa: deflake unit test * fixup

)

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

…eady

k8s-ci-robot · 2025-11-20T09:29:05Z

[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

chrischdi · 2025-11-20T09:29:05Z

/test help

k8s-ci-robot · 2025-11-20T09:29:08Z

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

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

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

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

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

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

The following commands are available to trigger optional jobs:

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

/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

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

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-provider-aws-apidiff-main

pull-cluster-api-provider-aws-build

pull-cluster-api-provider-aws-build-docker

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

pull-cluster-api-provider-aws-test

pull-cluster-api-provider-aws-verify

In response to this:

/test help

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-20T09:29:17Z

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

chrischdi · 2025-11-20T09:33:09Z

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

chrischdi · 2025-11-20T10:35:04Z

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

k8s-ci-robot · 2025-11-20T10:41:07Z

@chrischdi: The following test 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-apidiff-main	`87d6860`	link	false	`/test pull-cluster-api-provider-aws-apidiff-main`

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-20T11:53:44Z

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

damdo · 2025-11-21T07:45:56Z

This gave us good signal on the e2e fix. We can close it now

/close

bryan-cox and others added 30 commits November 14, 2025 17:42

WIP no IDE errors

cef8a4d

WIP IDE Errors

e5f0d8f

Fix go dependencies

454cc67

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

Update imports, code and generations to CAPI 1.11

ce62bbc

- 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. Signed-off-by: Borja Clemente <[email protected]>

Update linting pkg alias and fix broken imports blocks

0b8bf56

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

Remove unnecessary Paused constants

1491bcb

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

Fix import aliases

d35c4ab

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

Fix broken imports

bd9f9f4

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

Revert public APIS back to v1beta1 while internally using v1beta2

5ad2783

Introducing v1beta2 on public types is a breaking change so they have to stay in v1beta1. Internally though, migration to v1beta2 is happening (except for conditions). Signed-off-by: Borja Clemente <[email protected]>

Revert infrav1 conditions to v1beta1 and consolidate imports

6c66522

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

Consolidate conditions imports and fix linting

3a3dc37

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

Fix regression in machine deployments without failure domain set

54e4777

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

Revert missing public APIs to v1beta1

dcc5efe

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

Consolidate infrav1beta1 imports into infrav1

71840b7

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

Remove unused conditions constants

8ad6446

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

Fix setting wrong condition type

4c5e489

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

Cast v1beta1 conditions instead of creating a new constant

6944e51

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

Revert changed public APIs and adapt internally to v1beta2

d329175

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

Resolve conflicts with main

fd6e22a

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

Add deprecated CAPI imports linter rule

e3e4196

Add rule to allow using deprecated v1beta1 CAPI APIs and removed linter comments everywhere. Signed-off-by: Borja Clemente <[email protected]>

Apply review corrections

7e08d67

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

Adjust e2e and metadata versions

3664d96

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

Apply review feedback on awscluster_webhook

5169bd4

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

FIx unit tests

0d2f5dc

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

Review feedback

15706dd

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

Apply review feedback

b721c59

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

Add CRD RBAC to the awsmachine controller

8596a85

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

e2e: add v1beta1 CAPI scheme to clients and adjust modifyFunc test to…

2664a38

… use the new field name

clebs and others added 10 commits November 19, 2025 20:07

Fix nodeDrainTimeoutSeconds field in clusterclass test

d404119

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

e2e: fix contract for CAPI

e44c28b

fix path again

2ccb333

e2e: fix contract for capa 9.99.99 (kubernetes-sigs#3)

67816bf

e2e: use correct type for setting field (kubernetes-sigs#4)

7ed7f8b

rosa: deflake unit test (kubernetes-sigs#5)

e407421

* rosa: deflake unit test * fixup

e2e: fix config metadata and contract version pinning (kubernetes-sigs#6

653dac1

)

e2e: fix config metadata file path

d1bda80

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

Bump KCP Template for clusterclass changes (kubernetes-sigs#7)

4601e0d

e2e: adjust timeout for clusterclass-changes for all machines being r…

0e7518b

…eady

k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. needs-priority cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 20, 2025

k8s-ci-robot requested review from damdo and serngawy November 20, 2025 09:29

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 20, 2025

DANGER DoNotMerge bump CAPI to fork

87d6860

chrischdi force-pushed the pr-test-timeout-fix branch from 2d84762 to 87d6860 Compare November 20, 2025 10:34

chrischdi mentioned this pull request Nov 20, 2025

🌱 e2e: use wait-machine-upgrade timeout in ClusterClassChanges tests to wait for machines to be ready kubernetes-sigs/cluster-api#13013

Merged

damdo closed this Nov 21, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[DNR][WIP] 🌱 Testing Timeout fix for CAPI v1.11 clusterclass-changes #5756

[DNR][WIP] 🌱 Testing Timeout fix for CAPI v1.11 clusterclass-changes #5756

chrischdi commented Nov 20, 2025

Uh oh!

k8s-ci-robot commented Nov 20, 2025

Uh oh!

chrischdi commented Nov 20, 2025

Uh oh!

k8s-ci-robot commented Nov 20, 2025

Uh oh!

chrischdi commented Nov 20, 2025

Uh oh!

chrischdi commented Nov 20, 2025

Uh oh!

chrischdi commented Nov 20, 2025

Uh oh!

k8s-ci-robot commented Nov 20, 2025 •

edited

Loading

Uh oh!

damdo commented Nov 20, 2025

Uh oh!

damdo commented Nov 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

[DNR][WIP] 🌱 Testing Timeout fix for CAPI v1.11 clusterclass-changes #5756

[DNR][WIP] 🌱 Testing Timeout fix for CAPI v1.11 clusterclass-changes #5756

Conversation

chrischdi commented Nov 20, 2025

Uh oh!

k8s-ci-robot commented Nov 20, 2025

Uh oh!

chrischdi commented Nov 20, 2025

Uh oh!

k8s-ci-robot commented Nov 20, 2025

Uh oh!

chrischdi commented Nov 20, 2025

Uh oh!

chrischdi commented Nov 20, 2025

Uh oh!

chrischdi commented Nov 20, 2025

Uh oh!

k8s-ci-robot commented Nov 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

damdo commented Nov 20, 2025

Uh oh!

damdo commented Nov 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

k8s-ci-robot commented Nov 20, 2025 •

edited

Loading