OCPBUGS-83513: Merge https://github.com/kubernetes-sigs/cluster-api:v1.12.5 (efc7142) into master#275
Merged
openshift-merge-bot[bot] merged 48 commits intoopenshift:masterfrom Apr 17, 2026
Conversation
Signed-off-by: Stefan Büringer buringerst@vmware.com
Signed-off-by: Stefan Büringer buringerst@vmware.com
Signed-off-by: sivchari <shibuuuu5@gmail.com>
…bot/cherry-pick-13180-to-release-1.12 [release-1.12] 🐛 Fix flaky TestClusterReconciler unit test
…bot/cherry-pick-13470-to-release-1.12 [release-1.12] 🐛 fix flaky by waiting for CRD finalizer processing
…flake [release-1.12] 🐛 Fix TestMachineSetReconciler_createMachines_preflightChecks flake
Signed-off-by: Troy Connor <troy0820@users.noreply.github.com>
…bot/cherry-pick-13482-to-release-1.12 [release-1.12] 🌱Bump cert-manager to v1.20.0
Signed-off-by: Stefan Büringer buringerst@vmware.com
…-1.12-kcp-surface-etcd-learner [release-1.12] 🌱 KCP surfaces learner etcd members
…bot/cherry-pick-13493-to-release-1.12 [release-1.12] 🌱 Reduce verbosity of CAPD exec log
Signed-off-by: Adarsh Agrawal <adarsh.agrawal1@ibm.com>
[release-1.12] 🌱 Bump dependencies to fix CVE-2026-33186 (google.golang.org/grpc)
Signed-off-by: Troy Connor <troy0820@users.noreply.github.com>
…bot/cherry-pick-13515-to-release-1.12 [release-1.12] 🌱Bump cert-manager to v1.20.1
Signed-off-by: Stefan Büringer buringerst@vmware.com
…-1.12-bump-coredns-migrator-v1.0.31 [release-1.12] 🌱 Bump corefile-migration to v1.0.31
Signed-off-by: Stefan Büringer buringerst@vmware.com
…bot/cherry-pick-13514-to-release-1.12 [release-1.12] ✨ Improve CAPD wait for multi-user target
…bot/cherry-pick-13527-to-release-1.12 [release-1.12] 📖 Add instruction on how to look up max supported CoreDNS version
…esting-K8s1.36-release-1.12 [release-1.12] 🌱 Start testing with Kubernetes v1.36.0-beta.0
…-1.12-bump-go-v1.25.9 [release-1.12] 🌱 Bump go v1.25.9
…-1.12-switch-from-docker-to-moby [release-1.12] 🌱 Switch from docker to moby dependencies
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository: openshift/coderabbit/.coderabbit.yaml Review profile: CHILL Plan: Pro Plus Run ID: ⛔ Files ignored due to path filters (289)
📒 Files selected for processing (11)
✅ Files skipped from review due to trivial changes (8)
🚧 Files skipped from review as they are similar to previous changes (2)
WalkthroughBumps Go toolchain to 1.25.9; updates default cert-manager to v1.20.1 in code and docs; treats etcd learner members as unhealthy and skips alarm checks; adjusts CRD test to poll for deletion; and upgrades several module/tooling dependencies. Changes
Sequence Diagram(s)sequenceDiagram
participant Etcd as EtcdMember
participant Ctrl as KCPController
participant Machine as MachineStatus
participant Alarm as AlarmChecker
Etcd->>Ctrl: report member state (IsLearner=true)
Ctrl->>Machine: set MachineEtcdMemberHealthy = False\n(reason: Waiting for learner etcd member to be promoted)
Ctrl->>Ctrl: set KCP EtcdCluster condition = False\n(list affected machines)
Ctrl->>Alarm: skip alarm evaluation for this member
Alarm-->>Ctrl: no evaluation performed
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (1 error, 1 warning)
✅ Passed checks (8 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Warning Review ran into problems🔥 ProblemsGit: Failed to clone repository. Please run the Comment |
openshift-ci
bot
added
the
needs-ok-to-test
Squash adjacent toolchain updates touching openshift/tools so kustomize alignment and IPAM pinning are applied together.
…olicy: Ignore Add functions to set the failurePolicy to Ignore for both mutating and validating webhooks handling IPAM resources. During bootstrap, the bootstrap node's Kube API Server receives IPAM create requests but is unable to reach the webhooks in the Cluster API namespace. This is because the bootstrap node doesn't have a route to the pods as it doesn't have access to the pod networks. If failurePolicy is set to Fail, the KAS cannot reach the webhook endpoints and the request fails, preventing creation of IPAddress and IPAddressClaim resources. This causes a chicken-and-egg problem as it prevents IPAM provisioning for the workers which won't start without their IP addresses being allocated. Setting failurePolicy to Ignore allows the resources to be created even when the webhooks are unreachable during bootstrap, matching what Machine API also does. More context: https://redhat-internal.slack.com/archives/C0A2M43S199/p1765540108488539
Squash ART image consistency updates into a single carry commit.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Squash adjacent carries that iterate over OpenShift manifests generation, IPAM kustomization, and Dockerfile image consistency.
…erRoles In an aggregated ClusterRole, the rules field is created and managed by clusterrole-aggregation-controller. It is also defined to be atomic. This means that specifying it as empty is not only redundant, it will cause a conflict when reconciling the resource with SSA.
… upstream rebase Squash the post-rebase regeneration steps into a single carry commit so the PR keeps one coherent update for generated manifests and dependency vendoring.
RadekManak
force-pushed
the
rebase-bot-master
branch
from
86ab364 to
9cd7ddb
Compare
|
@cloud-team-rebase-bot[bot]: This pull request references Jira Issue OCPBUGS-83513, which is valid. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (ocp-sustaining-admins@redhat.com), skipping review request. DetailsIn response to this:
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. |
|
/label rebase/manual |
openshift-ci
bot
added
the
rebase/manual
|
@cloud-team-rebase-bot[bot]: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
Member
|
/verified by CI |
openshift-ci-robot
added
the
verified
|
@damdo: This PR has been marked as verified by DetailsIn response to this:
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. |
|
@cloud-team-rebase-bot[bot]: Jira Issue Verification Checks: Jira Issue OCPBUGS-83513 Jira Issue OCPBUGS-83513 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓 DetailsIn response to this:
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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by CodeRabbit
New Features
Documentation
Chores