OCPBUGS-85015: Sync upstream main 2026-04-23 - #453
openshift-merge-bot[bot] merged 8 commits into
Conversation
The branch protection is managed from the https://github.com/kubernetes/test-infra repository. It currently requires that the "Integration" job will pass. But since we now the integration is a matrics that creates two test lanes, then the "integration" rule is never satisfied. This PR renames the original "integration" job, to "integration-tests", and adds new rollout job with the original name of "integration", to pass only if all the jobs defined by the matrix passed. Now the existing "Integration" branch protection rule should work. Signed-off-by: Nahshon Unna Tsameret <nahsh.ut@gmail.com>
the webhook server should use the tlsconfig specified in the manager options, so users setting tls fields in the manager see their preference honoured not only for the metrics server but also for the webhook server. Core CAPI does this already, here: https://github.com/kubernetes-sigs/cluster-api/blob/55e16f424c0ed8d3739070125d4c32a036997465/main.go#L406
drainNode() was using vmiInstance.Status.EvacuationNodeName to look up the node in the guest cluster, but that field contains the host/infra node name. This caused the drain to silently fail with a NotFound error, meaning workloads were abruptly killed instead of being gracefully evicted. Use KubevirtMachine.Name instead, which is the guest node name, consistent with the rest of the codebase (e.g. updateNodeProviderID, GenerateProviderID). Update unit tests to use distinct values for the host node name and guest node name, so the bug cannot be masked again. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The eviction e2e test only validated that the VMI was deleted and recreated, but did not check that the guest node was actually drained. Add an assertion that the guest node is marked unschedulable (cordoned) before the VMI finalizer is removed. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…ction Signed-off-by: Nahshon Unna Tsameret <nunnatsa@redhat.com>
Bump golang to v1.25 Bump K8s API to v0.35 Bump CAPI API to v1.12 Bump Kubevirt to v1.8.0 Bump all other dependencies Signed-off-by: Nahshon Unna Tsameret <nunnatsa@redhat.com>
…l state When a KubeVirt VM is stopped (runStrategy changed to Halted), the VMI reaches a finalized state and IsTerminal() correctly sets FailureReason on the KubevirtMachine. However, when the VM is started back (runStrategy changed to Always), IsTerminal() returns false but the FailureReason/FailureMessage fields are never cleared. This causes the CAPI Machine phase to stay stuck at "Failed" even though all Machine conditions (Ready, InfrastructureReady, NodeHealthy) are True. Downstream consumers that rely on the Machine phase (such as HyperShift's endpointslice reconciler) then permanently mark endpoints as not ready, breaking ingress into hosted clusters. The fix adds an else clause to nil out FailureReason and FailureMessage when IsTerminal() returns false, allowing VMs to properly recover. Signed-off-by: Enrique Llorente <ellorent@redhat.com>
Signed-off-by: Nahshon Unna Tsameret <nunnatsa@redhat.com>
|
@openshift-cherrypick-robot: An error was encountered cloning bug for cherrypick for bug OCPBUGS-66890 on the Jira server at https://redhat.atlassian.net. No known errors were detected, please see the full error message for details. Full error message.
request failed. Please analyze the request body for more details. Status code: 400: {"errorMessages":["QA Contact: User 'Ying Zhou' is not valid for this user picker."],"errors":{"customfield_10470":"User 'Ying Zhou' is not valid for this user picker."}}
Please contact an administrator to resolve this issue, then request a bug refresh with 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. |
|
/retitle OCPBUGS-85015,OCPBUGS-66890: Sync upstream main 2026-04-23 |
openshift-ci
Bot
changed the title
openshift-ci-robot
added
jira/severity-important
|
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-85015, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. This pull request references Jira Issue OCPBUGS-66890, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. 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. |
|
/jira refresh |
|
@qinqon: This pull request references Jira Issue OCPBUGS-85015, which is valid. The bug has been moved to the POST state. 7 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (yli2@redhat.com), skipping review request. This pull request references Jira Issue OCPBUGS-66890, which is invalid:
Comment 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. |
|
/retitle OCPBUGS-85015: Sync upstream main 2026-04-23 |
openshift-ci
Bot
changed the title
openshift-ci-robot
added
jira/valid-bug
|
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-85015, which is valid. 7 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (yli2@redhat.com), skipping review request. The bug has been updated to refer to the pull request using the external bug tracker. 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. |
|
/retest |
|
/lgtm |
|
openshift/hypershift#8272 merged. |
|
openshift/hypershift#8438 merged. |
|
local-e2e workflow passed. |
|
openshift/release#79081 merged. |
|
@openshift-cherrypick-robot: 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. |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: openshift-cherrypick-robot, orenc1, qinqon 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
fd4d7a6
into
openshift:release-4.22
|
@openshift-cherrypick-robot: Jira Issue OCPBUGS-85015: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-85015 has been moved to the MODIFIED state. 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. |
|
/jira cherry-pick 4.21 |
6 participants
This is an automated cherry-pick of #419
/assign nunnatsa