[release-4.21] OCPBUGS-69417: fix: e2e: CAPI creation issue/scale-down wait issue/machine nodeRef comparison issue #433
Conversation
The MAPI-authoritative MachineSet migration test was using WaitForMachineSet after a scale-down operation. This function is designed for scale-up scenarios where it waits for new machines to reach "Running" phase and verifies node readiness by connecting to the workload cluster. For scale-down operations, this is inappropriate because: - No new machines are being provisioned that need to become running - It requires workload cluster connectivity to verify node status - The remaining machines were already running before the scale-down The test was failing with "not all Machines are running: 0 of 1" after 30 minutes because the CAPI MachineSet controller couldn't connect to the workload cluster to verify node status, causing availableReplicas to be reported as 0. Replace WaitForMachineSet with verifyMachinesetReplicas for the scale-down test, consistent with the analogous test in machineset_migration_capi_authoritative_test.go. The verifyMachinesetReplicas function only verifies the replica count matches the expected value, which is sufficient for scale-down validation.
The CAPIMachineStatusEqual function was missing NodeRef in its comparison of CAPI machine status fields. This meant that when a MAPI machine received a node assignment (status.nodeRef), the sync controller didn't detect it as a change and didn't sync it to the CAPI machine mirror. This caused the CAPI machine to have an empty NodeRef, which led to: - CAPI MachineSet controller unable to verify node status - MachineSet reporting availableReplicas: 0 for running machines - Incorrect machine readiness calculations The conversion function already correctly included NodeRef in the converted status, but without the comparison, status updates were not triggered when only NodeRef changed. Add NodeRef to the list of compared fields in CAPIMachineStatusEqual so that changes to NodeRef are properly detected and synced from MAPI to CAPI machine mirrors.
|
Pipeline controller notification For optional jobs, comment This repository is configured in: LGTM mode |
|
Important Review skippedAuto reviews are limited based on label configuration. 🚫 Review skipped — only excluded labels are configured. (1)
Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the ✨ Finishing touches🧪 Generate unit tests (beta)
Comment |
|
@openshift-cherrypick-robot: Jira Issue OCPBUGS-63524 has been cloned as Jira Issue OCPBUGS-69417. Will retitle bug to link to clone. 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. |
openshift-ci
bot
changed the title
openshift-ci-robot
added
jira/valid-reference
|
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-69417, 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. |
|
/label acknowledge-critical-fixes-only Fixes issues in the CAPI AWS e2e tests |
openshift-ci
bot
added
acknowledge-critical-fixes-only
|
Scheduling tests matching the |
|
/label backport-risk-assessed |
openshift-ci
bot
added
approved
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: chrischdi, 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 |
|
/retest |
|
@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. |
|
/verified by ci jobs |
openshift-ci-robot
added
the
verified
|
@sunzhaohua2: 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. |
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@damdo: This pull request references Jira Issue OCPBUGS-69417, which is valid. The bug has been moved to the POST state. 7 validation(s) were run on this bug
Requesting review from QA contact: 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. |
openshift-merge-bot
bot
merged commit ac5a5a4
into
openshift:release-4.21
|
@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-69417 Jira Issue OCPBUGS-69417 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. |
|
Fix included in accepted release 4.21.0-0.nightly-2025-12-18-020818 |
8 participants
This is an automated cherry-pick of #429
/assign damdo