Merge https://github.com/kubernetes-sigs/cluster-api:v1.12.0 (b52de69) into master #255

cloud-team-rebase-bot · 2025-12-11T12:12:16Z

No description provided.

…concileUnhealthyMachines Signed-off-by: Stefan Büringer buringerst@vmware.com

…machines-flake 🌱 Fix flakes in syncMachines unit test

…flake-race 🌱 Fix race conditions with global scheme in TestMachineSetReconciler_reconcileUnhealthyMachines

Signed-off-by: Lennart Jern <lennart.jern@est.tech>

* Call new lifecycle hooks for chained-upgrades * Address comments * More feedback

…but is not running

…12903) * call GenerateUpgradePlanRequest Runtime Extension Signed-off-by: sivchari <shibuuuu5@gmail.com> * add unit test for UpgradePlan extension Signed-off-by: sivchari <shibuuuu5@gmail.com> * fix lint error Signed-off-by: sivchari <shibuuuu5@gmail.com> * fix review findings Signed-off-by: sivchari <shibuuuu5@gmail.com> --------- Signed-off-by: sivchari <shibuuuu5@gmail.com>

…yflake 🌱 add DisableCertPrivateKey function for clustercache for test flake

…c-reconcile 🌱 machinehealthcheck: no longer requeue when remediation is not allowed

…ecreate-container-if-not-running 🌱 CAPD: recreate container if we re-enter reconciliation and it exists but is not running

…-doc-timeouts 📖 Document e2e test timeout changes in v1.11-to-v1.12 migration doc

✨ Add EncryptionAlgorithm to Kubeadmconfig

…he-after-apply 🌱 Add items to cache immediately after apply

Signed-off-by: Alexandr Demicev <alexandr.demicev@suse.com>

… 3 updates Bumps the all-go-mod-patch-and-minor group with 1 update in the / directory: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime). Bumps the all-go-mod-patch-and-minor group with 3 updates in the /hack/tools directory: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime), [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) and [google.golang.org/api](https://github.com/googleapis/google-api-go-client). Bumps the all-go-mod-patch-and-minor group with 1 update in the /test directory: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime). Updates `sigs.k8s.io/controller-runtime` from 0.22.3 to 0.22.4 - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.22.3...v0.22.4) Updates `sigs.k8s.io/controller-runtime` from 0.22.3 to 0.22.4 - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.22.3...v0.22.4) Updates `cloud.google.com/go/storage` from 1.57.0 to 1.57.1 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](googleapis/google-cloud-go@spanner/v1.57.0...storage/v1.57.1) Updates `google.golang.org/api` from 0.253.0 to 0.254.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](googleapis/google-api-go-client@v0.253.0...v0.254.0) Updates `sigs.k8s.io/controller-runtime` from 0.22.3 to 0.22.4 - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.22.3...v0.22.4) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.22.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.22.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor - dependency-name: cloud.google.com/go/storage dependency-version: 1.57.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor - dependency-name: google.golang.org/api dependency-version: 0.254.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-go-mod-patch-and-minor - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.22.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor ... Signed-off-by: dependabot[bot] <support@github.com>

🌱 Check for error before checking reconcile result

…bot/go_modules/all-go-mod-patch-and-minor-a3eca44266 🌱 Bump the all-go-mod-patch-and-minor group across 3 directories with 3 updates

…necontroller ✨ Add in-place updates support for machine controller

Signed-off-by: Stefan Büringer buringerst@vmware.com

…ating-to-machine-ready 🌱 Consider updating condition when computing Machine's ready condition

* add-in-place-to-machineset-controller * Fix review findings Signed-off-by: Stefan Büringer buringerst@vmware.com * Address comments --------- Signed-off-by: Stefan Büringer buringerst@vmware.com Co-authored-by: Stefan Bueringer <buringerst@vmware.com>

…pdating-phase 🌱 Implement Updating Machine phase

…sistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-cluster-api.yml

…sistent with ART for 4.21 Reconciling with https://github.com/openshift/ocp-build-data/tree/1097a63a576d216981abbff7a60c4c5da67d1644/images/ose-cluster-api.yml

We can't push v1beta2 IPAM to production clusters without also running the conversion webhook, so we pin to the last released version which did not have it. TPNU clusters continue to get the latest CAPI.

openshift-ci · 2025-12-11T12:12:52Z

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

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

openshift-ci · 2025-12-11T12:13:18Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: cloud-team-rebase-bot[bot]
Once this PR has been reviewed and has the lgtm label, please assign radekmanak for approval. For more information see the Code Review Process.

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

Details

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

damdo · 2025-12-11T16:27:37Z

/ok-to-test

damdo · 2025-12-12T20:11:54Z

This is failing because the core CAPI manifests need updating

invalid argument "MachinePool=true,ClusterResourceSet=true,ClusterTopology=false,RuntimeSDK=false,MachineSetPreflightChecks=false" for "--feature-gates" flag: unrecognized feature gate: ClusterResourceSet

ref:
https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openshift_cluster-api/255/pull-ci-openshift-cluster-api-master-e2e-gcp-capi-techpreview/1999154317008834560/artifacts/e2e-gcp-capi-techpreview/gather-extra/artifacts/pods/openshift-cluster-api_capi-controller-manager-6889b9f8d4-wm6pt_manager.log

… rebase

damdo · 2025-12-12T20:20:36Z

/label rebase/manual

damdo · 2025-12-12T20:21:11Z

Updated here: e8611ec

openshift-ci · 2025-12-12T20:27:56Z

The following users are mentioned in OWNERS file(s) but are untrusted for the following reasons. One way to make the user trusted is to add them as members of the openshift org. You can then trigger verification by writing /verify-owners in a comment.

cluster-api-reviewers
- User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
cluster-api-machinepool-reviewers
- User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
cluster-api-machinepool-maintainers
- User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.

damdo · 2025-12-16T09:30:54Z

/test e2e-aws-capi-techpreview e2e-aws-serial-1of2

openshift-ci · 2025-12-16T12:57:35Z

@cloud-team-rebase-bot[bot]: 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
ci/prow/e2e-aws-capi-techpreview	`a7cb6fa`	link	true	`/test e2e-aws-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.

damdo · 2025-12-16T15:00:02Z

I think the change in kubernetes-sigs#12959 (which this bump brings in)
broke some assumptions in our e2e around deletion propagation.
I am investigating

openshift-merge-robot · 2025-12-21T22:36:09Z

PR needs rebase.

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.

sbueringer and others added 30 commits October 30, 2025 16:47

Fix race conditions with global scheme in TestMachineSetReconciler_re…

ed843a3

…concileUnhealthyMachines Signed-off-by: Stefan Büringer buringerst@vmware.com

Merge pull request kubernetes-sigs#12918 from sbueringer/pr-fix-sync-…

6e3d61e

…machines-flake 🌱 Fix flakes in syncMachines unit test

Merge pull request kubernetes-sigs#12919 from sbueringer/pr-fix-test-…

c6df77f

…flake-race 🌱 Fix race conditions with global scheme in TestMachineSetReconciler_reconcileUnhealthyMachines

add disableprivatekey

38268cb

Change ComputeRequestIdentifier parameters to clarify usage

5d3943e

Signed-off-by: Lennart Jern <lennart.jern@est.tech>

✨ Call new lifecycle hooks for chained-upgrades (kubernetes-sigs#12891)

45159ff

* Call new lifecycle hooks for chained-upgrades * Address comments * More feedback

CAPD: recreate container if we re-enter reconciliation and it exists …

9bfdc0e

…but is not running

machinehealthcheck: no longer requeue when remediation is not allowed

57a2fa4

Merge pull request kubernetes-sigs#12921 from ivelichkovich/privateke…

decc0c3

…yflake 🌱 add DisableCertPrivateKey function for clustercache for test flake

Merge pull request kubernetes-sigs#12924 from schrej/fix/continous-mh…

2a3fabb

…c-reconcile 🌱 machinehealthcheck: no longer requeue when remediation is not allowed

Merge pull request kubernetes-sigs#12923 from chrischdi/pr-e2e-capd-r…

6384bca

…ecreate-container-if-not-running 🌱 CAPD: recreate container if we re-enter reconciliation and it exists but is not running

Address review comme

1c76d86

🌱 Add metal-stack provider

74c2867

Merge pull request kubernetes-sigs#12917 from sbueringer/pr-migration…

0b520b1

…-doc-timeouts 📖 Document e2e test timeout changes in v1.11-to-v1.12 migration doc

Merge pull request kubernetes-sigs#12859 from Karthik-K-N/rsa-key

87d9768

✨ Add EncryptionAlgorithm to Kubeadmconfig

Merge pull request kubernetes-sigs#12877 from Nordix/lentzi90/ssa-cac…

313199c

…he-after-apply 🌱 Add items to cache immediately after apply

Handle error check first before checking reconcile result

838f044

Add in-place updates support for machine controller

c315bcf

Signed-off-by: Alexandr Demicev <alexandr.demicev@suse.com>

Merge pull request kubernetes-sigs#12935 from Karthik-K-N/error-check

74df86c

🌱 Check for error before checking reconcile result

Merge pull request kubernetes-sigs#12937 from kubernetes-sigs/dependa…

68b0e0c

…bot/go_modules/all-go-mod-patch-and-minor-a3eca44266 🌱 Bump the all-go-mod-patch-and-minor group across 3 directories with 3 updates

Merge pull request kubernetes-sigs#12831 from alexander-demicev/machi…

6c59755

…necontroller ✨ Add in-place updates support for machine controller

Implement e2e test for in-place updates

8dcfbaf

Signed-off-by: Stefan Büringer buringerst@vmware.com

Consider updating condition when computing Machine's ready condition

372aee0

Implement Updating Machine phase

5d67371

Signed-off-by: Stefan Büringer buringerst@vmware.com

Merge pull request kubernetes-sigs#12939 from fabriziopandini/add-upd…

d08a59d

…ating-to-machine-ready 🌱 Consider updating condition when computing Machine's ready condition

fix: specify container path and mode

35dacf0

Merge pull request kubernetes-sigs#12940 from sbueringer/pr-machine-u…

ad89904

…pdating-phase 🌱 Implement Updating Machine phase

AOS Automation Release Team and others added 6 commits December 11, 2025 12:09

UPSTREAM: <carry>: Updating ose-cluster-api-container image to be con…

ae1f989

…sistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-cluster-api.yml

UPSTREAM: <carry>: Sync OWNERS file

3821f5f

UPSTREAM: <carry>: Updating ose-cluster-api-container image to be con…

d8a3892

…sistent with ART for 4.21 Reconciling with https://github.com/openshift/ocp-build-data/tree/1097a63a576d216981abbff7a60c4c5da67d1644/images/ose-cluster-api.yml

UPSTREAM: <carry>: openshift: rename manager binary

dc56ff3

UPSTREAM: <carry>: Pin IPAM CRD manifests to CAPI from release-4.20

b92fab8

We can't push v1beta2 IPAM to production clusters without also running the conversion webhook, so we pin to the last released version which did not have it. TPNU clusters continue to get the latest CAPI.

UPSTREAM: <carry>: Update kustomize

fe1c368

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 Dec 11, 2025

openshift-ci bot requested review from chrischdi and mdbooth December 11, 2025 12:13

openshift-ci bot added the do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. label Dec 11, 2025

openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 11, 2025

damdo and others added 4 commits December 12, 2025 21:19

UPSTREAM: <carry>: Update Kustomize Patch

e8611ec

UPSTREAM: <drop>: Update manifests generator

f146799

UPSTREAM: <drop>: Generate OpenShift manifests

a6ce18d

UPSTREAM: <drop>: Updating and vendoring go modules after an upstream…

a7cb6fa

… rebase

damdo force-pushed the rebase-bot-master branch from 03150af to a7cb6fa Compare December 12, 2025 20:20

openshift-ci bot added the rebase/manual Indicates the PR should not be rebased by the rebasebot. label Dec 12, 2025

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge https://github.com/kubernetes-sigs/cluster-api:v1.12.0 (b52de69) into master #255

Merge https://github.com/kubernetes-sigs/cluster-api:v1.12.0 (b52de69) into master #255

Uh oh!

cloud-team-rebase-bot bot commented Dec 11, 2025

Uh oh!

openshift-ci bot commented Dec 11, 2025

Uh oh!

openshift-ci bot commented Dec 11, 2025

Uh oh!

damdo commented Dec 11, 2025

Uh oh!

damdo commented Dec 12, 2025

Uh oh!

damdo commented Dec 12, 2025

Uh oh!

damdo commented Dec 12, 2025

Uh oh!

openshift-ci bot commented Dec 12, 2025

Uh oh!

damdo commented Dec 16, 2025

Uh oh!

openshift-ci bot commented Dec 16, 2025

Uh oh!

damdo commented Dec 16, 2025 •

edited

Loading

Uh oh!

openshift-merge-robot commented Dec 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Merge https://github.com/kubernetes-sigs/cluster-api:v1.12.0 (b52de69) into master #255

Are you sure you want to change the base?

Merge https://github.com/kubernetes-sigs/cluster-api:v1.12.0 (b52de69) into master #255

Uh oh!

Conversation

cloud-team-rebase-bot bot commented Dec 11, 2025

Uh oh!

openshift-ci bot commented Dec 11, 2025

Uh oh!

openshift-ci bot commented Dec 11, 2025

Uh oh!

damdo commented Dec 11, 2025

Uh oh!

damdo commented Dec 12, 2025

Uh oh!

damdo commented Dec 12, 2025

Uh oh!

damdo commented Dec 12, 2025

Uh oh!

openshift-ci bot commented Dec 12, 2025

Uh oh!

damdo commented Dec 16, 2025

Uh oh!

openshift-ci bot commented Dec 16, 2025

Uh oh!

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

Uh oh!

Uh oh!

openshift-merge-robot commented Dec 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

damdo commented Dec 16, 2025 •

edited

Loading