Skip to content

Bump Cluster API to v1.11.4 #2003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
furkatgofurov7 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Bump Cluster API to v1.11.4 #2003

furkatgofurov7 wants to merge 9 commits into from

Conversation

@furkatgofurov7
Copy link
Contributor

@furkatgofurov7 furkatgofurov7 commented Jan 16, 2026

What this PR does / why we need it:

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:

  • squashed commits into logical changes
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

@furkatgofurov7 furkatgofurov7 added the area/dependency Issues or PRs related to dependency changes label Jan 16, 2026
@furkatgofurov7 furkatgofurov7 requested a review from a team as a code owner January 16, 2026 15:03
@furkatgofurov7 furkatgofurov7 moved this to In Progress (8 max) in CAPI / Turtles Jan 16, 2026
@kkaempf kkaempf added this to the v2.14.0 milestone Jan 19, 2026
@furkatgofurov7 furkatgofurov7 force-pushed the bump-capi-v1.11.4 branch 7 times, most recently from fa3c0c3 to b7b0744 Compare January 20, 2026 15:21
salasberryfin
salasberryfin reviewed Jan 20, 2026
View reviewed changes
Copy link
Contributor

@salasberryfin salasberryfin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @furkatgofurov7! Overall looks good to me.

@furkatgofurov7
Copy link
Contributor Author

furkatgofurov7 commented Jan 21, 2026

@salasberryfin thanks for review, I addressed all your concerns and suggestions in 8faa02e

salasberryfin
salasberryfin reviewed Jan 21, 2026
View reviewed changes
Copy link
Contributor

@salasberryfin salasberryfin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can probably disable any RKE2-related E2E tests since they'll be failing until the provider version is bumped to a v1.11 compatible release (not yet ready 😓).

examples/clusterclasses/aws/rke2/clusterclass-ec2-rke2-example.yaml
Copy link
Contributor

@salasberryfin salasberryfin Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would expect this to be broken until a new CAPRKE2 release with support for CAPI v1.11 is out, and then we'll have to add some extra changes to the templates.

@furkatgofurov7 furkatgofurov7 force-pushed the bump-capi-v1.11.4 branch 2 times, most recently from 23981b4 to a35b066 Compare January 27, 2026 08:28
@furkatgofurov7
Bump core CAPI and infrastructure providers to newer versions support…
6fd54ea 
…ing CAPI v1.11.x

Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Bump CAPI to v1.11.4 and use v1beta2 API types
049f254 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Fix 'build-chart-bump-capi' Makefile target and generate templates
9f0404c 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Add core provider components
6f9a3a4 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Additional fixes
4518d69 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Update templates to use v1beta2 API version
4922564 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
More fixes
4246f5b 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Address review comments
24e57d3 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
@furkatgofurov7
Revert examples/* templates to use v1beta1 API
b23030b 
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
salasberryfin
salasberryfin reviewed Jan 27, 2026
View reviewed changes
test/e2e/data/cluster-templates/docker-kubeadm-topology.yaml
Comment on lines 22 to 24
controlPlane:
metadata: {}
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
Copy link
Contributor

@salasberryfin salasberryfin Jan 27, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
controlPlane:
replicas: ${CONTROL_PLANE_MACHINE_COUNT}

While working on CAPRKE2 I noticed that topology.controlPlane.metadata can no longer be empty and thought I'd share it here. We'll probably need to remove it from here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@salasberryfin salasberryfin salasberryfin left review comments

At least 2 approving reviews are required to merge this pull request.

Assignees

No one assigned

Labels

area/dependency Issues or PRs related to dependency changes kind/spike

Projects

CAPI / Turtles
Status: In Progress (8 max)

Milestone

v2.14.0

Development

Successfully merging this pull request may close these issues.

3 participants

@furkatgofurov7 @salasberryfin @kkaempf