Bump CAPI to v1.11.3 #5979

chrischdi · 2025-11-18T12:05:49Z

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Supersedes:

Updates Cluster API to v1.11.3.

[WIP] Bump CAPI to v1.11.2 #5661

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 #5658
Fixes #5602
Closes #5661

Required Issues/PRs to get this green

Unexpected rollout when using KCP and updating to v1.11 cluster-api#13017
[release-1.11] 🌱 e2e: allow usage of v1beta1 and v1beta2 for MachinePools in clusterctl upgrade cluster-api#13023

Special notes for your reviewer:

TODOs:

squashed commits
includes documentation
adds unit tests
cherry-pick candidate

Release note:

Bump CAPI to v1.11.3

codecov · 2025-11-18T12:52:46Z

Codecov Report

❌ Patch coverage is 45.27221% with 191 lines in your changes missing coverage. Please review.
✅ Project coverage is 44.64%. Comparing base (7d26cf4) to head (38ff448).
⚠️ Report is 2 commits behind head on main.

Files with missing lines	Patch %	Lines
azure/scope/managedcontrolplane.go	11.11%	22 Missing and 2 partials ⚠️
azure/scope/machinepoolmachine.go	16.66%	20 Missing ⚠️
azure/scope/machine.go	21.73%	18 Missing ⚠️
util/azure/azure.go	14.28%	18 Missing ⚠️
azure/scope/machinepool.go	46.66%	16 Missing ⚠️
azure/scope/cluster.go	25.00%	15 Missing ⚠️
azure/scope/managedmachinepool.go	21.05%	15 Missing ⚠️
controllers/helpers.go	65.51%	7 Missing and 3 partials ⚠️
exp/controllers/azuremachinepool_controller.go	22.22%	7 Missing ⚠️
api/v1beta1/azuremanagedcontrolplane_webhook.go	42.85%	2 Missing and 2 partials ⚠️
... and 23 more

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #5979      +/-   ##
==========================================
- Coverage   44.72%   44.64%   -0.08%     
==========================================
  Files         279      279              
  Lines       25274    25244      -30     
==========================================
- Hits        11304    11271      -33     
- Misses      13144    13150       +6     
+ Partials      826      823       -3

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

chrischdi · 2025-11-19T12:45:47Z

Unsure about the occurring errors.

The aks errors show:

The client '765e6bfb-2fd8-4c1e-8ee4-79df6a972ce7' with object id '02ef41cf-1158-4336-9ca6-5d4183184f39'
  does not have authorization to perform action 'Microsoft.Resources/subscriptions/resourceGroups/read'
  over scope '/subscriptions/46678f10-4bbb-447e-98e8-d2829589f2d8/resourceGroups/<resource-group-name>'

chrischdi · 2025-11-21T13:39:40Z

/test pull-cluster-api-provider-azure-conformance-custom-builds

Unrelated error:

[2025-11-21 13:20:38] 	[ERROR ImagePull]: failed to pull image registry.k8s.io/kube-apiserver:v1.35.0-beta.0.6_5bcb7599736327: failed to pull image registry.k8s.io/kube-apiserver:v1.35.0-beta.0.6_5bcb7599736327: rpc error: code = NotFound desc = failed to pull and unpack image "registry.k8s.io/kube-apiserver:v1.35.0-beta.0.6_5bcb7599736327": failed to resolve reference "registry.k8s.io/kube-apiserver:v1.35.0-beta.0.6_5bcb7599736327": registry.k8s.io/kube-apiserver:v1.35.0-beta.0.6_5bcb7599736327: not found

damdo · 2025-11-21T17:43:26Z

cc. @mboersma @jackfrancis @willie-yao

chrischdi · 2025-11-21T18:53:24Z

/retest

damdo · 2025-11-24T07:20:51Z

/retest

chrischdi · 2025-11-24T10:08:50Z

/test pull-cluster-api-provider-azure-conformance-custom-builds

Unrelated error (from cloud-init):

[2025-11-24 09:53:27] [ERROR ImagePull]: failed to pull image registry.k8s.io/kube-proxy:v1.35.0-beta.0.6_5bcb7599736327: failed to pull image registry.k8s.io/kube-proxy:v1.35.0-beta.0.6_5bcb7599736327: rpc error: code = NotFound desc = failed to pull and unpack image "registry.k8s.io/kube-proxy:v1.35.0-beta.0.6_5bcb7599736327": failed to resolve reference "registry.k8s.io/kube-proxy:v1.35.0-beta.0.6_5bcb7599736327": registry.k8s.io/kube-proxy:v1.35.0-beta.0.6_5bcb7599736327: not found

chrischdi · 2025-11-24T12:11:04Z

/retest

chrischdi · 2025-11-24T15:50:25Z

/retest

Gh networking issues

chrischdi · 2025-12-01T07:21:01Z

/hold

To wait for kubernetes-sigs/cluster-api#13060

@mboersma , @willie-yao , @jackfrancis

It would be awesome to get some opinion on this PR and also on kubernetes-sigs/cluster-api#13060 :-)

chrischdi · 2025-12-01T15:36:15Z

cc @nojnhuh

chrischdi · 2025-12-02T08:01:44Z

/retest

Unrelated http request ci flake to third party data.

chrischdi · 2025-12-02T08:26:53Z

/hold cancel

damdo · 2025-12-02T13:38:15Z

/assign @mboersma @jackfrancis @willie-yao @nojnhuh

controllers/helpers.go

controllers/helpers_test.go

docs/book/src/developers/getting-started-with-capi-operator.md

templates/test/ci/patches/control-plane-kubeadm-boostrap-ci-version.yaml

templates/test/dev/cluster-template-custom-builds-windows.yaml

test/e2e/config/azure-dev.yaml

test/e2e/aks_byo_node.go

test/e2e/common.go

Makefile

Tiltfile

mboersma · 2025-12-04T16:58:55Z

controllers/helpers.go:1086:39: invalid operation: cluster.Spec.InfrastructureRef == nil (mismatched types "sigs.k8s.io/cluster-api/api/core/v1beta2".ContractVersionedObjectReference and untyped nil)
controllers/helpers.go:1091:45: cluster.Spec.InfrastructureRef.Namespace undefined (type "sigs.k8s.io/cluster-api/api/core/v1beta2".ContractVersionedObjectReference has no field or method Namespace)
make: *** [Makefile:233: manager] Error 1

Weird, I wonder why this didn't fail before since it doesn't seem like the last commit touched it.

nojnhuh

Not a full review, just happened to notice a couple of dependency things. I may not get to looking at the rest of the changes by the time we want to merge this so don't wait for me.

Looking forward to checking this off the list!

go.mod

chrischdi · 2025-12-08T06:27:20Z

controllers/helpers.go:1086:39: invalid operation: cluster.Spec.InfrastructureRef == nil (mismatched types "sigs.k8s.io/cluster-api/api/core/v1beta2".ContractVersionedObjectReference and untyped nil)
controllers/helpers.go:1091:45: cluster.Spec.InfrastructureRef.Namespace undefined (type "sigs.k8s.io/cluster-api/api/core/v1beta2".ContractVersionedObjectReference has no field or method Namespace)
make: *** [Makefile:233: manager] Error 1

Weird, I wonder why this didn't fail before since it doesn't seem like the last commit touched it.

Had to do a rebase due to #5990

chrischdi · 2025-12-08T09:43:33Z

/retest

mboersma

This lgtm. @chrischdi do you want to squash?

I think the test failure is a flake, but we'll see.

mboersma

/lgtm
/approve

Thanks so much @chrischdi!

k8s-ci-robot · 2025-12-08T20:28:01Z

LGTM label has been added.

Git tree hash: ddcdd011e0220bc8dbbdd759f9fb3c02dd2b732b

k8s-ci-robot · 2025-12-08T20:28:04Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mboersma

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~~ [mboersma]

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

github-project-automation bot added this to CAPZ Planning Nov 18, 2025

github-project-automation bot moved this to Todo in CAPZ Planning Nov 18, 2025

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 18, 2025

k8s-ci-robot requested review from Jont828 and willie-yao November 18, 2025 12:05

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

chrischdi force-pushed the pr-capi-rebase-one-eleven-test branch from 845f0fd to f4b28a7 Compare November 18, 2025 12:41

chrischdi mentioned this pull request Nov 20, 2025

[release-1.11] 🌱 e2e: allow usage of v1beta1 and v1beta2 for MachinePools in clusterctl upgrade kubernetes-sigs/cluster-api#13023

Merged

chrischdi force-pushed the pr-capi-rebase-one-eleven-test branch 2 times, most recently from d2b0f55 to 15af32d Compare November 21, 2025 06:54

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 21, 2025

chrischdi force-pushed the pr-capi-rebase-one-eleven-test branch from 02667fa to 13ea58e Compare November 21, 2025 16:12

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 21, 2025

chrischdi force-pushed the pr-capi-rebase-one-eleven-test branch 2 times, most recently from e092a2c to 971dd90 Compare November 21, 2025 16:38

damdo mentioned this pull request Nov 21, 2025

[WIP] Bump CAPI to v1.11.2 #5661

Closed

4 tasks

chrischdi force-pushed the pr-capi-rebase-one-eleven-test branch from d2ddf10 to fc92d0d Compare November 24, 2025 15:14

chrischdi force-pushed the pr-capi-rebase-one-eleven-test branch from fc92d0d to 5e6d68a Compare November 24, 2025 19:57

chrischdi changed the title ~~Bump CAPI to v1.11.2~~ Bump CAPI to v1.11.3 Dec 1, 2025

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 1, 2025

chrischdi force-pushed the pr-capi-rebase-one-eleven-test branch from e8aa667 to 2a090e4 Compare December 2, 2025 07:34

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 2, 2025

k8s-ci-robot assigned jackfrancis, mboersma, nojnhuh and willie-yao Dec 2, 2025

mboersma reviewed Dec 3, 2025

View reviewed changes

nojnhuh reviewed Dec 5, 2025

View reviewed changes

go.mod Outdated Show resolved Hide resolved

go.mod Outdated Show resolved Hide resolved

chrischdi force-pushed the pr-capi-rebase-one-eleven-test branch from d603a0e to fdeff29 Compare December 8, 2025 06:34

mboersma reviewed Dec 8, 2025

View reviewed changes

Bump Cluster API to v1.11.3

38ff448

chrischdi force-pushed the pr-capi-rebase-one-eleven-test branch from 9abed05 to 38ff448 Compare December 8, 2025 17:59

mboersma approved these changes Dec 8, 2025

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 8, 2025

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 8, 2025

k8s-ci-robot merged commit dec74fd into kubernetes-sigs:main Dec 8, 2025
29 of 32 checks passed

k8s-ci-robot added this to the v1.22 milestone Dec 8, 2025

github-project-automation bot moved this from Todo to Done in CAPZ Planning Dec 8, 2025

Bump CAPI to v1.11.3 #5979

Bump CAPI to v1.11.3 #5979

Conversation

chrischdi commented Nov 18, 2025 • edited by mboersma Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Nov 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

chrischdi commented Nov 19, 2025

Uh oh!

chrischdi commented Nov 21, 2025

Uh oh!

damdo commented Nov 21, 2025

Uh oh!

chrischdi commented Nov 21, 2025

Uh oh!

damdo commented Nov 24, 2025

Uh oh!

chrischdi commented Nov 24, 2025

Uh oh!

chrischdi commented Nov 24, 2025

Uh oh!

chrischdi commented Nov 24, 2025

Uh oh!

chrischdi commented Dec 1, 2025

Uh oh!

chrischdi commented Dec 1, 2025

Uh oh!

chrischdi commented Dec 2, 2025

Uh oh!

chrischdi commented Dec 2, 2025

Uh oh!

damdo commented Dec 2, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mboersma commented Dec 4, 2025

Uh oh!

nojnhuh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

chrischdi commented Dec 8, 2025

Uh oh!

chrischdi commented Dec 8, 2025

Uh oh!

mboersma left a comment

Choose a reason for hiding this comment

Uh oh!

mboersma left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Dec 8, 2025

Uh oh!

k8s-ci-robot commented Dec 8, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

chrischdi commented Nov 18, 2025 •

edited by mboersma

Loading

codecov bot commented Nov 18, 2025 •

edited

Loading