OCPBUGS-90521: fix(nodepool): don't explicitly set the MinReadySeconds default

[sdminonne]

Summary

• Remove unconditional MinReadySeconds defaulting from MachineDeployment and MachineSet reconciliation, matching what PR CNTRLPLANE-2207: Upgrade to CAPI 1.11 #8594 (CAPI 1.11 upgrade) already did on main.

Problem

The e2e-aws-upgrade-hypershift-operator test on release-4.22 has been 100% broken for all PRs since PR #8594 merged to main on June 3.

The upgrade test installs the pre-upgrade operator from hypershift/hypershift-operator:latest (built from main), which after #8594 no longer sets MinReadySeconds on MachineDeployments. It then upgrades to the release-4.22 operator, which unconditionally sets MinReadySeconds = *int32(0). This causes a spec change (nil → *int32(0)) on every MachineDeployment, bumping .metadata.generation from 1 to 2, and failing the upgrade invariant check:

Pre-upgrade and post-upgrade MachineDeployment generations should match
Expected <int64>: 2 to equal <int64>: 1

Fix

Remove the explicit MinReadySeconds defaulting from both reconcileMachineDeployment() and reconcileMachineSet() in capi.go. The CAPI controller applies its own defaults, making the explicit setting unnecessary — as recognized by the removal in #8594 on main.

Test plan

• e2e-aws-upgrade-hypershift-operator should pass on release-4.22
• Unit tests pass (go test ./hypershift-operator/controllers/nodepool/...)

References

• Root cause PR (CAPI 1.11 on main): CNTRLPLANE-2207: Upgrade to CAPI 1.11 #8594
• Example failing run: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_hypershift/8625/pull-ci-openshift-hypershift-release-4.22-e2e-aws-upgrade-hypershift-operator/2063882654004023296

🤖 Generated with Claude Code

[openshift-merge-bot]

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

[openshift-ci-robot]

@sdminonne: This pull request references Jira Issue OCPBUGS-90521, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
• expected Jira Issue OCPBUGS-90521 to depend on a bug targeting a version in 5.0.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Summary

• Remove unconditional MinReadySeconds defaulting from MachineDeployment and MachineSet reconciliation, matching what PR CNTRLPLANE-2207: Upgrade to CAPI 1.11 #8594 (CAPI 1.11 upgrade) already did on main.

Problem

The e2e-aws-upgrade-hypershift-operator test on release-4.22 has been 100% broken for all PRs since PR #8594 merged to main on June 3.

The upgrade test installs the pre-upgrade operator from hypershift/hypershift-operator:latest (built from main), which after #8594 no longer sets MinReadySeconds on MachineDeployments. It then upgrades to the release-4.22 operator, which unconditionally sets MinReadySeconds = *int32(0). This causes a spec change (nil → *int32(0)) on every MachineDeployment, bumping .metadata.generation from 1 to 2, and failing the upgrade invariant check:

Pre-upgrade and post-upgrade MachineDeployment generations should match
Expected <int64>: 2 to equal <int64>: 1

Fix

Remove the explicit MinReadySeconds defaulting from both reconcileMachineDeployment() and reconcileMachineSet() in capi.go. The CAPI controller applies its own defaults, making the explicit setting unnecessary — as recognized by the removal in #8594 on main.

Test plan

• e2e-aws-upgrade-hypershift-operator should pass on release-4.22
• Unit tests pass (go test ./hypershift-operator/controllers/nodepool/...)

References

• Root cause PR (CAPI 1.11 on main): CNTRLPLANE-2207: Upgrade to CAPI 1.11 #8594
• Example failing run: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_hypershift/8625/pull-ci-openshift-hypershift-release-4.22-e2e-aws-upgrade-hypershift-operator/2063882654004023296

🤖 Generated with Claude Code

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.

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 384a6857-37a0-4632-b504-b892c3dd8dd6

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[sdminonne]

/cc @jparrill

[sdminonne]

/uncc @cblecker

[openshift-ci]

@sdminonne: all tests passed!

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.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 35.44%. Comparing base (5cb8735) to head (7926dad).
⚠️ Report is 2 commits behind head on release-4.22.

Additional details and impacted files

@@               Coverage Diff                @@
##           release-4.22    #8783      +/-   ##
================================================
- Coverage         35.45%   35.44%   -0.01%     
================================================
  Files               767      767              
  Lines             93724    93718       -6     
================================================
- Hits              33226    33220       -6     
  Misses            57785    57785              
  Partials           2713     2713              

Files with missing lines	Coverage Δ
hypershift-operator/controllers/nodepool/capi.go	68.70% <ø> (-0.18%)	⬇️

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[jparrill]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jparrill, sdminonne

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 [jparrill]

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

[sdminonne]

/pipeline-required

[enxebre]

/hold

[openshift-ci-robot]

@sdminonne: This pull request references Jira Issue OCPBUGS-90521. The bug has been updated to no longer refer to the pull request using the external bug tracker. All external bug links have been closed. The bug has been moved to the NEW state.

Details

In response to this:

Summary

• Remove unconditional MinReadySeconds defaulting from MachineDeployment and MachineSet reconciliation, matching what PR CNTRLPLANE-2207: Upgrade to CAPI 1.11 #8594 (CAPI 1.11 upgrade) already did on main.

Problem

The e2e-aws-upgrade-hypershift-operator test on release-4.22 has been 100% broken for all PRs since PR #8594 merged to main on June 3.

The upgrade test installs the pre-upgrade operator from hypershift/hypershift-operator:latest (built from main), which after #8594 no longer sets MinReadySeconds on MachineDeployments. It then upgrades to the release-4.22 operator, which unconditionally sets MinReadySeconds = *int32(0). This causes a spec change (nil → *int32(0)) on every MachineDeployment, bumping .metadata.generation from 1 to 2, and failing the upgrade invariant check:

Pre-upgrade and post-upgrade MachineDeployment generations should match
Expected <int64>: 2 to equal <int64>: 1

Fix

Remove the explicit MinReadySeconds defaulting from both reconcileMachineDeployment() and reconcileMachineSet() in capi.go. The CAPI controller applies its own defaults, making the explicit setting unnecessary — as recognized by the removal in #8594 on main.

Test plan

• e2e-aws-upgrade-hypershift-operator should pass on release-4.22
• Unit tests pass (go test ./hypershift-operator/controllers/nodepool/...)

References

• Root cause PR (CAPI 1.11 on main): CNTRLPLANE-2207: Upgrade to CAPI 1.11 #8594
• Example failing run: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_hypershift/8625/pull-ci-openshift-hypershift-release-4.22-e2e-aws-upgrade-hypershift-operator/2063882654004023296

🤖 Generated with Claude Code

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.