OCPCLOUD-3104: Merge https://github.com/kubernetes-sigs/cluster-api:v1.11.3 (7b1cf36) into master #243

cloud-team-rebase-bot · 2025-06-19T12:22:03Z

No description provided.

openshift-ci · 2025-06-19T12:22:39Z

Hi @cloud-team-rebase-bot[bot]. Thanks for your PR.

I'm waiting for a openshift 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.

Details

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.

Signed-off-by: chandankumar4 <[email protected]>

…otes-v1.11.0-beta.1 🚀 Release v1.11.0-beta.1

…S-to-runtime-extensions ✨ Add mTLS support to runtime extension server and client

…add-notimestamps ✨ Bump KAL & add the notimestamps linter

* Fix lifecycle hooks conversions * Address feedback * More comments

…-sigs#12481) * align CAPD conversion to conversion of other providers Signed-off-by: sivchari <[email protected]> * fix review findings Signed-off-by: sivchari <[email protected]> * fix review findings Signed-off-by: sivchari <[email protected]> --------- Signed-off-by: sivchari <[email protected]>

…tes-sigs#12516) * bump Kubernetes version used for testing to v1.34.0-beta.0 Signed-off-by: sivchari <[email protected]> * addressed minor findings Signed-off-by: sivchari <[email protected]> --------- Signed-off-by: sivchari <[email protected]>

* Move deletePolicy to deletion.order Signed-off-by: Stefan Büringer [email protected] * Move maxInFlight * Rename KCP remediationStrategy to remediation Signed-off-by: Stefan Büringer [email protected] * Restructure KCP spec.rollout fields Signed-off-by: Stefan Büringer [email protected] * Restructure strategy fields in MD, Cluster and ClusterClass Signed-off-by: Stefan Büringer [email protected] * Adjust e2e YAML files according to API changes * Fix review findings * Fix e2e tests --------- Signed-off-by: Stefan Büringer [email protected]

🐛 Fix e2e tests by fixing the etcd tag

* Improve migration doc * Fix review findings --------- Co-authored-by: Stefan Bueringer <[email protected]>

Signed-off-by: Stefan Büringer [email protected]

tests Signed-off-by: Stefan Büringer [email protected]

…-test 🐛 Fix flakes in TestAPIAndWebhookChanges unit test

Signed-off-by: Stefan Büringer [email protected]

chrischdi · 2025-12-02T16:05:49Z

@chrischdi Regarding the ci/prow/e2e-azure-capi-techpreview failures here

I am seeing this error coming up a lot here E1201 13:11:31.509803 1 cluster_accessor.go:262] "Connect failed" err="error creating HTTP client and mapper: cluster is not reachable: the server has asked for the client to provide credentials" controller="clustercache" controllerGroup="cluster.x-k8s.io" controllerKind="Cluster" Cluster="openshift-cluster-api/ci-op-1r232y5y-f959d-jg7sq" namespace="openshift-cluster-api" name="ci-op-1r232y5y-f959d-jg7sq" reconcileID="60f29753-12eb-4c6e-a561-e805f9709c4b"

Are you aware of these? Do you think that's an incompatibility with the CAPZ version we currently have on main? Do we need to test this PR with openshift/cluster-api-provider-azure#354 ?

Weird, this test was green already on commit: 375d13b and is broken now on 72f4d67

The only diff I see is the binary name change.

Could that also be the gallery image thing?

/test e2e-azure-capi-techpreview

damdo · 2025-12-02T16:33:36Z

Digging deeper this is the failure:

> Enter [BeforeAll] Cluster API Azure MachineSet - /tmp/tmp.tqoDIHNvjB/e2e/azure_test.go:35 @ 11/24/25 13:44:12.177
< Exit [BeforeAll] Cluster API Azure MachineSet - /tmp/tmp.tqoDIHNvjB/e2e/azure_test.go:35 @ 11/24/25 13:44:13.313 (1.137s)
> Enter [It] should be able to run a machine - /tmp/tmp.tqoDIHNvjB/e2e/azure_test.go:53 @ 11/24/25 13:44:13.313
STEP: Creating Azure machine template - /tmp/tmp.tqoDIHNvjB/e2e/azure_test.go:89 @ 11/24/25 13:44:13.314
[FAILED] Expected
    <string>: 
not to be empty
In [It] at: /tmp/tmp.tqoDIHNvjB/e2e/azure_test.go:94 @ 11/24/25 13:44:13.314
< Exit [It] should be able to run a machine - /tmp/tmp.tqoDIHNvjB/e2e/azure_test.go:53 @ 11/24/25 13:44:13.314 (1ms)
> Enter [AfterEach] Cluster API Azure MachineSet - /tmp/tmp.tqoDIHNvjB/e2e/azure_test.go:42 @ 11/24/25 13:44:13.314
[PANICKED] Test Panicked
In [AfterEach] at: /usr/lib/golang/src/runtime/panic.go:262 @ 11/24/25 13:44:13.315

runtime error: invalid memory address or nil pointer dereference

Full Stack Trace
  github.com/openshift/cluster-capi-operator/e2e/framework.WaitForMachineSetsDeleted({0x4347860, 0xc0007a1290}, {0xc00019aef0, 0x1, 0xc00019aef0?})
  	/tmp/tmp.tqoDIHNvjB/e2e/framework/machineset.go:100 +0xc4
  github.com/openshift/cluster-capi-operator/e2e.init.func2.2()
  	/tmp/tmp.tqoDIHNvjB/e2e/azure_test.go:49 +0x265
< Exit [AfterEach] Cluster API Azure MachineSet - /tmp/tmp.tqoDIHNvjB/e2e/azure_test.go:42 @ 11/24/25 13:44:13.315 (0s)

This is the interesting part:

STEP: Creating Azure machine template - /tmp/tmp.tqoDIHNvjB/e2e/azure_test.go:89 @ 11/24/25 13:44:13.314
[FAILED] Expected
    <string>: 
not to be empty
In [It] at: /tmp/tmp.tqoDIHNvjB/e2e/azure_test.go:94 @ 11/24/25 13:44:13.314

// and

runtime error: invalid memory address or nil pointer dereference
...
  	/tmp/tmp.tqoDIHNvjB/e2e/framework/machineset.go:100 +0xc4

Coming from: https://github.com/openshift/cluster-capi-operator/blob/615b4f77636c4ed38910ccab6d4636246c08afca/e2e/azure_test.go#L94

So the mapiProviderSpec.Image is empty, which is most probably due to the image gallery changes in the installer openshift/installer#10076 (context here)

chrischdi · 2025-12-03T14:25:11Z

/test e2e-hypershift

damdo · 2025-12-03T16:33:40Z

/test e2e-hypershift

damdo · 2025-12-03T16:37:22Z

/override ci/prow/e2e-openstack-capi-techpreview

Job passed already on https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-api/243/pull-ci-openshift-cluster-api-master-e2e-openstack-capi-techpreview/1994075411792793600 but there are CI issues at the moment preventing it from going green again. Ref: https://redhat-internal.slack.com/archives/CBZHF4DHC/p1764762212579539

openshift-ci · 2025-12-03T16:37:49Z

@damdo: Overrode contexts on behalf of damdo: ci/prow/e2e-openstack-capi-techpreview

Details

In response to this:

/override ci/prow/e2e-openstack-capi-techpreview

Job passed already on https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-api/243/pull-ci-openshift-cluster-api-master-e2e-openstack-capi-techpreview/1994075411792793600 but there are CI issues at the moment preventing it from going green again. Ref: https://redhat-internal.slack.com/archives/CBZHF4DHC/p1764762212579539

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.

damdo · 2025-12-03T16:38:43Z

/override ci/prow/e2e-azure-capi-techpreview

Job passed already on https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-api/243/pull-ci-openshift-cluster-api-master-e2e-azure-capi-techpreview/1991485701786439680
but there are is an installer/MAPI issue at the moment preventing it from going green again. Ref: https://redhat-internal.slack.com/archives/CBZHF4DHC/p1764555476621779

openshift-ci · 2025-12-03T16:39:27Z

@damdo: Overrode contexts on behalf of damdo: ci/prow/e2e-azure-capi-techpreview

Details

In response to this:

/override ci/prow/e2e-azure-capi-techpreview

Job passed already on https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-api/243/pull-ci-openshift-cluster-api-master-e2e-azure-capi-techpreview/1991485701786439680
but there are is an installer/MAPI issue at the moment preventing it from going green again. Ref: https://redhat-internal.slack.com/archives/CBZHF4DHC/p1764555476621779

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.

damdo

/approve
/lgtm

/verified later

/hold

openshift-ci · 2025-12-03T16:42:11Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cloud-team-rebase-bot[bot], damdo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [damdo]

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

openshift-ci-robot · 2025-12-03T16:47:46Z

@damdo: /verified later <@username> requires at least one GitHub @username to be specified (it can be a comma delimited list). It indicates the engineer(s) that will be performing the verification. See https://docs.ci.openshift.org/docs/architecture/jira/#premerge-verification for more information.

Details

In response to this:

/verified later

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 openshift-eng/jira-lifecycle-plugin repository.

damdo · 2025-12-03T16:48:49Z

/label acknowledge-critical-fixes-only

This is a critical bump we need to merge, also is a component only getting deployed in TechPreviewNoUpgrade which does not directly affect payload stability

damdo · 2025-12-03T16:49:06Z

/verified later @sunzhaohua2

openshift-ci-robot · 2025-12-03T16:49:21Z

@damdo: This PR has been marked to be verified later by @sunzhaohua2.

Details

In response to this:

/verified later @sunzhaohua2

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 openshift-eng/jira-lifecycle-plugin repository.

damdo · 2025-12-03T18:37:32Z

/test e2e-hypershift

damdo · 2025-12-03T20:41:35Z

/test e2e-hypershift

shellyyang1989 · 2025-12-04T03:10:38Z

/hold cancel

openshift-ci · 2025-12-04T06:35:56Z

@cloud-team-rebase-bot: 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
ci/prow/e2e-aws-ovn-techpreview	`72f4d67`	link	unknown	`/test e2e-aws-ovn-techpreview`
ci/prow/e2e-azure-capi-techpreview	`72f4d67`	link	unknown	`/test e2e-azure-capi-techpreview`

Full PR test history. Your PR dashboard.

Details

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.

openshift-ci bot requested review from RadekManak and sub-mod June 19, 2025 12:22

openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 19, 2025

cloud-team-bot bot force-pushed the rebase-bot-master branch 2 times, most recently from 46948e9 to 79882b9 Compare June 26, 2025 12:21

cloud-team-bot bot force-pushed the rebase-bot-master branch 2 times, most recently from 2c3b28d to a12210c Compare July 7, 2025 12:24

cloud-team-bot bot force-pushed the rebase-bot-master branch from a12210c to 7408ae3 Compare July 14, 2025 12:12

cloud-team-rebase-bot bot changed the title ~~Merge https://github.com/kubernetes-sigs/cluster-api:v1.10.3 (9beb81e) into master~~ Merge https://github.com/kubernetes-sigs/cluster-api:v1.10.4 (737edc8) into master Jul 17, 2025

cloud-team-bot bot force-pushed the rebase-bot-master branch from 7408ae3 to e416f1e Compare July 17, 2025 12:28

chandankumar4 and others added 9 commits July 22, 2025 20:50

🚀 Release v1.11.0-beta.1

1e64f04

Signed-off-by: chandankumar4 <[email protected]>

Merge pull request kubernetes-sigs#12514 from chandankumar4/release-n…

fb0e2da

…otes-v1.11.0-beta.1 🚀 Release v1.11.0-beta.1

Add mTLS support to runtime extension server and client

be7a741

Merge pull request kubernetes-sigs#12517 from fabriziopandini/add-mTL…

ff9f91e

…S-to-runtime-extensions ✨ Add mTLS support to runtime extension server and client

Bump KAL & add the notimestamps linter

114837a

Merge pull request kubernetes-sigs#12520 from sbueringer/pr-bump-kal-…

9acc8fe

…add-notimestamps ✨ Bump KAL & add the notimestamps linter

🌱 Fix lifecycle hooks conversions (kubernetes-sigs#12507)

ea14c4d

* Fix lifecycle hooks conversions * Address feedback * More comments

cloud-team-bot bot force-pushed the rebase-bot-master branch from e416f1e to 1642c19 Compare July 24, 2025 12:24

sbueringer and others added 9 commits July 24, 2025 06:26

Fix e2e tests by bumping etcd

de8c7cb

Merge pull request kubernetes-sigs#12523 from sbueringer/pr-fixup-e2e

2e709a2

🐛 Fix e2e tests by fixing the etcd tag

📖 Improve migration doc (kubernetes-sigs#12521)

7ec8c4c

* Improve migration doc * Fix review findings --------- Co-authored-by: Stefan Bueringer <[email protected]>

Fix race in TestAPIAndWebhookChanges unit test

32c21db

Signed-off-by: Stefan Büringer [email protected]

Print the entire object diff if resource versions are not stable in e2e

05ed9ae

tests Signed-off-by: Stefan Büringer [email protected]

Merge pull request kubernetes-sigs#12526 from sbueringer/pr-fix-flaky…

2179443

…-test 🐛 Fix flakes in TestAPIAndWebhookChanges unit test

Change all *metav1.Time fields to metav1.Time

05f4cf9

Signed-off-by: Stefan Büringer [email protected]

Fix review findings

e9498d0

damdo mentioned this pull request Dec 2, 2025

OCPCLOUD-3101: Merge https://github.com/kubernetes-sigs/cluster-api-provider-azure:main (e695d87) into master openshift/cluster-api-provider-azure#354

Merged

chrischdi mentioned this pull request Dec 3, 2025

OCPCLOUD-3102: Merge https://github.com/kubernetes-sigs/cluster-api-provider-aws:v2.10.0 (175074f) into main openshift/cluster-api-provider-aws#582

Merged

damdo reviewed Dec 3, 2025

View reviewed changes

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

openshift-ci bot assigned damdo Dec 3, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 3, 2025

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 3, 2025

openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Dec 3, 2025

openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Dec 3, 2025

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

openshift-merge-bot bot merged commit 7daa198 into openshift:master Dec 4, 2025
17 checks passed

neisw mentioned this pull request Dec 11, 2025

TRT-2473: Revert "Pin IPAM CRDs to release-4.20" #254

Closed

OCPCLOUD-3104: Merge https://github.com/kubernetes-sigs/cluster-api:v1.11.3 (7b1cf36) into master #243

OCPCLOUD-3104: Merge https://github.com/kubernetes-sigs/cluster-api:v1.11.3 (7b1cf36) into master #243

Uh oh!

Conversation

cloud-team-rebase-bot bot commented Jun 19, 2025

Uh oh!

openshift-ci bot commented Jun 19, 2025

Uh oh!

chrischdi commented Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

damdo commented Dec 2, 2025

Uh oh!

chrischdi commented Dec 3, 2025

Uh oh!

damdo commented Dec 3, 2025

Uh oh!

damdo commented Dec 3, 2025

Uh oh!

openshift-ci bot commented Dec 3, 2025

Uh oh!

damdo commented Dec 3, 2025

Uh oh!

openshift-ci bot commented Dec 3, 2025

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Dec 3, 2025

Uh oh!

openshift-ci-robot commented Dec 3, 2025

Uh oh!

damdo commented Dec 3, 2025

Uh oh!

damdo commented Dec 3, 2025

Uh oh!

openshift-ci-robot commented Dec 3, 2025

Uh oh!

damdo commented Dec 3, 2025

Uh oh!

damdo commented Dec 3, 2025

Uh oh!

shellyyang1989 commented Dec 4, 2025

Uh oh!

Uh oh!

openshift-ci bot commented Dec 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

chrischdi commented Dec 2, 2025 •

edited

Loading