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

k8s-ci-robot · 2025-11-18T12:05:57Z

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

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

Codecov Report

❌ Patch coverage is 44.95677% with 191 lines in your changes missing coverage. Please review.
✅ Project coverage is 44.46%. Comparing base (2130510) to head (a906a0f).
⚠️ 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	62.96%	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.54%   44.46%   -0.09%     
==========================================
  Files         279      279              
  Lines       25140    25110      -30     
==========================================
- Hits        11199    11164      -35     
- Misses      13128    13136       +8     
+ Partials      813      810       -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-11-28T13:04:06Z

/retest

Flake

chrischdi · 2025-11-29T07:18:05Z

/retest

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

mboersma · 2025-12-03T18:35:36Z

controllers/helpers.go

-		}
-	}
-	return nil, nil
+	return utilexp.GetOwnerMachinePool(ctx, c, obj)


mboersma · 2025-12-03T18:38:39Z

controllers/helpers_test.go

 	}
 }

-func TestClusterPauseChangeAndInfrastructureReady(t *testing.T) {


Nice to remove these helpers and their tests, this PR almost doesn't add any lines of code. 😄

mboersma · 2025-12-03T18:39:16Z

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


 ```yaml
-core: "cluster-api:v1.10.7"
+core: "cluster-api:v1.11.2"


Suggested change

core: "cluster-api:v1.11.2"

core: "cluster-api:v1.11.3"

mboersma · 2025-12-03T18:50:16Z

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

+      echo "$${LINE_SEPARATOR}"
      CI_VERSION=${CI_VERSION}
+
+      # Note: We assume if kubectl has the right version, everything else has as well


This seems like a reasonable early exit. Was this change from upstream? Just curious.

mboersma · 2025-12-03T18:57:50Z

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

        path: /tmp/oot-cred-provider.sh
        permissions: "0744"
-      - content: |
+      - content: |2


Suggested change

- content: |2

- content: |

Typo

mboersma · 2025-12-03T19:00:46Z

test/e2e/config/azure-dev.yaml

    loadBehavior: mustLoad
-  - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.7
+  # - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.11.3 # Bumped to nightly release-1.11 to 
+  - name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v20251201-v1.11.3-29-g889987e8d


I'm fine with merging this and then bumping up to v1.11.4 when it's out.

mboersma · 2025-12-03T19:04:12Z

test/e2e/aks_byo_node.go

-	"sigs.k8s.io/cluster-api/util/conditions"
+	bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
+	deprecatedv1beta1conditions "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"


These two packages are confusingly named.

mboersma · 2025-12-03T19:12:39Z

test/e2e/common.go

 		count := 0
 		for _, machine := range machineList.Items {
-			if condition := conditions.Get(&machine, clusterv1.MachineReadyV1Beta2Condition); condition != nil && condition.Status == corev1.ConditionTrue {
+			if meta.IsStatusConditionTrue(machine.GetConditions(), clusterv1.MachineReadyCondition) {


mboersma · 2025-12-03T19:15:15Z

Makefile


 	# Deploy CAPI
-	timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
+	timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.2/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"


Suggested change

timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.2/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"

timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.3/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"

mboersma · 2025-12-03T19:15:41Z

Tiltfile

    "preload_images_for_kind": True,
    "kind_cluster_name": "capz",
-    "capi_version": "v1.10.7",
+    "capi_version": "v1.11.2",


Suggested change

"capi_version": "v1.11.2",

"capi_version": "v1.11.3",

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

Draft

4 tasks

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

chrischdi added 6 commits November 28, 2025 12:26

fixup ASO crds

13764c4

Fix owner group checking

8a536d8

e2e: set target contract for upgrade spec

dc0f466

Makefile: fix kubectl wait for clusters to use v1beta1 for compatibility

ba8b67c

e2e: Bump CAPI v1.11 to nightly

eaa7010

e2e: adjust script for downloading CI artifacts to work

bd82da9

chrischdi force-pushed the pr-capi-rebase-one-eleven-test branch from f665fd8 to 4af053f Compare November 28, 2025 11:27

chrischdi force-pushed the pr-capi-rebase-one-eleven-test branch 2 times, most recently from 4d8a69f to e8aa667 Compare November 28, 2025 15:41

chrischdi changed the title ~~[WIP] Bump CAPI to v1.11.2~~ Bump CAPI to v1.11.2 Dec 1, 2025

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 1, 2025

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 added 2 commits December 2, 2025 08:33

Bump CAPI to v1.11.3 and test to commit

9528306

e2e: Bump CAPI v1.11 to nightly manifests

2a090e4

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

fixup

a906a0f

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

mboersma reviewed Dec 3, 2025

View reviewed changes

	timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.2/cluster-api-components.yaml \| $(ENVSUBST) \| $(KUBECTL) apply -f -; do sleep 5; done"
	timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.3/cluster-api-components.yaml \| $(ENVSUBST) \| $(KUBECTL) apply -f -; do sleep 5; done"

Bump CAPI to v1.11.3 #5979

Are you sure you want to change the base?

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!

k8s-ci-robot commented Nov 18, 2025

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 Nov 28, 2025

Uh oh!

chrischdi commented Nov 29, 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

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