Skip to content

test capi 1.11 - #8082

Closed
LiangquanLi930 wants to merge 7 commits into
openshift:mainfrom
LiangquanLi930:capi-1.11-bump
Closed

test capi 1.11#8082
LiangquanLi930 wants to merge 7 commits into
openshift:mainfrom
LiangquanLi930:capi-1.11-bump

Conversation

@LiangquanLi930

@LiangquanLi930 LiangquanLi930 commented Mar 26, 2026

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes

Special notes for your reviewer:

Checklist:

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

Summary by CodeRabbit

  • Chores
    • Updated Go module dependencies to newer versions for improved compatibility, stability, and security.
    • Adjusted lint configuration to suppress additional upstream deprecation warnings.
    • Tweaked build tooling targets and generation paths to streamline CRD/artifact generation.
    • Fixed file formatting to ensure proper end-of-file termination.

@openshift-ci-robot

Copy link
Copy Markdown

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

@coderabbitai

coderabbitai Bot commented Mar 26, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Excluded labels (none allowed) (1)
  • do-not-merge/work-in-progress

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), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: fb033530-c729-4336-be39-4e3a9e33d598

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
📝 Walkthrough

Walkthrough

Adds a staticcheck exclusion for SA1019 in .golangci.yml targeting sigs.k8s.io/cluster-api/(.*). Ensures the Dockerfile ends with a trailing newline. Modifies the Makefile cluster-api CRD generation to run controller-gen over ./vendor/sigs.k8s.io/cluster-api/api/core/... and ./vendor/sigs.k8s.io/cluster-api/api/ipam/... instead of previous vendor paths. Updates api/go.mod with multiple dependency version changes and removes several indirect requirements.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 26, 2026
@openshift-ci
openshift-ci Bot requested review from enxebre and muraee March 26, 2026 15:41
@openshift-ci openshift-ci Bot added the area/api Indicates the PR includes changes for the API label Mar 26, 2026
@openshift-ci

openshift-ci Bot commented Mar 26, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: LiangquanLi930
Once this PR has been reviewed and has the lgtm label, please assign sjenning 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:

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

@openshift-ci openshift-ci Bot added area/cli Indicates the PR includes changes for CLI area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release area/platform/aws PR/issue for AWS (AWSPlatform) platform area/platform/azure PR/issue for Azure (AzurePlatform) platform area/platform/gcp PR/issue for GCP (GCPPlatform) platform area/platform/ibmcloud PR/issue for IBMCloud (IBMCloudPlatform) platform area/platform/kubevirt PR/issue for KubeVirt (KubevirtPlatform) platform area/platform/openstack PR/issue for OpenStack (OpenStackPlatform) platform area/platform/powervs PR/issue for PowerVS (PowerVSPlatform) platform area/testing Indicates the PR includes changes for e2e testing and removed do-not-merge/needs-area labels Mar 26, 2026
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 26, 2026
@LiangquanLi930
LiangquanLi930 force-pushed the capi-1.11-bump branch 2 times, most recently from 970c047 to 39f16b0 Compare March 26, 2026 16:25
@LiangquanLi930

Copy link
Copy Markdown
Contributor Author

/test e2e-aws

@LiangquanLi930

Copy link
Copy Markdown
Contributor Author

/test e2e-aks

@cwbotbot

cwbotbot commented Mar 26, 2026

Copy link
Copy Markdown

Test Results

e2e-aws

Failed Tests

Total failed tests: 9

  • TestNodePool
  • TestNodePool/HostedCluster0
  • TestNodePool/HostedCluster0/Main
  • TestNodePool/HostedCluster0/Main/TestNTOMachineConfigGetsRolledOut
  • TestNodePool/HostedCluster0/Main/TestNodePoolReplaceUpgrade

... and 4 more failed tests

e2e-aks

Failed Tests

Total failed tests: 15

  • TestAutoscaling
  • TestAutoscaling/Main
  • TestAutoscaling/Main/TestAutoscaling
  • TestAutoscaling/Main/TestAutoscalingBalancing
  • TestNodePool

... and 10 more failed tests

@LiangquanLi930
LiangquanLi930 marked this pull request as draft March 27, 2026 04:31
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 27, 2026
@LiangquanLi930

Copy link
Copy Markdown
Contributor Author

/test e2e-aws

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 29, 2026
@LiangquanLi930
LiangquanLi930 force-pushed the capi-1.11-bump branch 5 times, most recently from 426527a to 16f6555 Compare March 30, 2026 00:06
@openshift-ci openshift-ci Bot added area/ai Indicates the PR includes changes related to AI - Claude agents, Cursor rules, etc. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 30, 2026
@LiangquanLi930
LiangquanLi930 force-pushed the capi-1.11-bump branch 3 times, most recently from 2d3b0c5 to c8ec842 Compare March 30, 2026 00:24
@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 30, 2026
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 30, 2026
@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 30, 2026
@openshift-ci

openshift-ci Bot commented Mar 30, 2026

Copy link
Copy Markdown
Contributor

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.

Migrate CAPI core types to v1beta2, remove conversion webhook, and fix
1.11 behavioral differences in initialization, NodePool readiness, and
replica tracking.

Squashed from 12 commits:
- fix(nodepool): gate MachineDeploymentComplete on ReadyReplicas
- fix(capi): use UpToDateReplicas instead of AvailableReplicas in MachineDeploymentComplete
- Revert "fix(capi): use Available condition for MachineDeployment NodePool Ready"
- fix(capi): use MachinesReady condition for NodePool Ready in v1beta2
- fix(capi): fix InfrastructureProvisioned timing and 0-worker e2e checks for CAPI 1.11
- fix(capi): don't unconditionally set ControlPlaneInitialized on CAPI Cluster
- fix(capi): add status.initialization.controlPlaneInitialized to HCP
- fix(capi): set ControlPlaneInitialized for externally managed control plane
- fix(capi): set status.initialization.provisioned on externally managed infra
- fix(rbac): grant CAPI manager patch access to CRDs for crdmigrator
- refactor(capi): migrate CAPI core types from v1beta1 to v1beta2

Signed-off-by: Liangquan Li <liangli@redhat.com>
@openshift-ci

openshift-ci Bot commented Mar 30, 2026

Copy link
Copy Markdown
Contributor

@LiangquanLi930: The following tests 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-gke 39f16b0 link false /test e2e-gke
ci/prow/e2e-aks 4349d3c link true /test e2e-aks
ci/prow/e2e-aws 4349d3c link true /test e2e-aws
ci/prow/security 67c20b7 link true /test security

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.

@openshift-bot

Copy link
Copy Markdown

Stale PRs are closed after 21d of inactivity.

If this PR is still relevant, comment to refresh it or remove the stale label.
Mark the PR as fresh by commenting /remove-lifecycle stale.

If this PR is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Apr 30, 2026
@openshift-ci

openshift-ci Bot commented May 14, 2026

Copy link
Copy Markdown
Contributor

Stale PRs rot after 14d of inactivity.

Mark the PR as fresh by commenting /remove-lifecycle rotten.
Rotten PRs close after an additional 7d of inactivity.

If this PR is safe to close now please do so with /close.

/lifecycle rotten
/remove-lifecycle stale

@openshift-ci openshift-ci Bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels May 14, 2026
@hypershift-jira-solve-ci

Copy link
Copy Markdown
Contributor

I now have a complete picture. Both failures stem from the same root cause. Let me produce the final report:

Test Failure Analysis Complete

Job Information

  • Prow Job: pull-ci-openshift-hypershift-main-security
  • Build ID: 2038643694889865216
  • PR: #8082 "test capi 1.11" by LiangquanLi930
  • Branch: capi-1.11-bumpmain
  • Job Duration: 45 seconds (15:45:07Z – 15:45:52Z, 2026-03-30)
  • Tide Status: ERROR (blocked by labels and merge conflicts)

Test Failure Analysis

Error

Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1

Summary

Both Prow job failures on PR #8082 share the same root cause: the PR branch capi-1.11-bump has a merge conflict with the main branch in vendor/modules.txt. The ci/prow/security job failed immediately during the git clone/merge phase — before any test code ever executed — because ci-operator could not merge the PR commit (67c20b79) into the base branch (9fda149b). The tide error is a direct consequence: the PR carries needs-rebase, do-not-merge/work-in-progress, and lifecycle/rotten labels, all of which prevent merging. No product bug or test flake is involved.

Root Cause

The PR branch capi-1.11-bump has diverged from main and has a content-level merge conflict in vendor/modules.txt. This is a dependency vendoring file that changes frequently as Go module dependencies are updated on main.

The PR bumps CAPI (Cluster API) to v1.11, which involves updating go.mod, go.sum, and the vendored modules. Since the PR was opened, other PRs merged into main have also modified vendor/modules.txt, creating incompatible changes.

Timeline of the failure:

  1. ci-operator clones the repo and checks out main at 9fda149b
  2. ci-operator attempts git merge --no-ff 67c20b79 (the PR head)
  3. Git auto-merges .golangci.yml, Makefile, cmd/install/install.go, go.mod, go.sum successfully
  4. Git encounters a CONFLICT in vendor/modules.txt and aborts
  5. ci-operator exits with status 1 — no tests are ever executed
  6. The job is marked as FAILED

Tide error is a downstream effect: the PR has three blocking labels:

  • needs-rebase — GitHub detected the merge conflict
  • do-not-merge/work-in-progress — PR is explicitly marked as WIP
  • lifecycle/rotten — PR has been stale long enough to be marked rotten (opened ~2 months ago)
Recommendations
  1. Rebase the PR branch onto current main — resolve the vendor/modules.txt conflict by re-running go mod vendor after rebasing:

    git fetch upstream main
    git rebase upstream/main
    # Resolve conflicts in vendor/modules.txt
    go mod tidy && go mod vendor
    git add vendor/ go.mod go.sum
    git rebase --continue
    git push --force-with-lease
  2. Remove blocking labels once the PR is ready for review:

    • Remove do-not-merge/work-in-progress (comment /unhold or remove the WIP prefix from the title)
    • needs-rebase will be automatically removed once the merge conflict is resolved
    • lifecycle/rotten will need to be manually removed (comment /remove-lifecycle rotten)
  3. Consider closing if the CAPI 1.11 bump is no longer needed — the PR is ~2 months old and marked rotten, suggesting it may have been superseded by other work.

Evidence
Evidence Detail
Failing file vendor/modules.txt — content-level merge conflict
Error exit code exit status 1 from git merge --no-ff
Base SHA 9fda149b7aef911a737f65386602d1b0395a214e (main)
PR HEAD SHA 67c20b790d7072698f08f6558451bfca7d1c6e5a
Successfully auto-merged .golangci.yml, Makefile, cmd/install/install.go, go.mod, go.sum
PR merge state CONFLICTING / DIRTY (confirmed via GitHub API)
Blocking labels needs-rebase, do-not-merge/work-in-progress, lifecycle/rotten
Job runtime 45 seconds — failed during clone phase, no tests executed
Total files in PR 30 files changed (large dependency bump)
Tide state ERROR — cannot merge due to labels and conflicts
Tests executed None — failure occurred before any CI step ran

@openshift-ci

openshift-ci Bot commented May 28, 2026

Copy link
Copy Markdown
Contributor

Rotten PRs close after 7d of inactivity.

Reopen the PR by commenting /reopen.
Mark the PR as fresh by commenting /remove-lifecycle rotten.

/close

@openshift-ci openshift-ci Bot closed this May 28, 2026
@openshift-ci

openshift-ci Bot commented May 28, 2026

Copy link
Copy Markdown
Contributor

@openshift-ci[bot]: Closed this PR.

Details

In response to this:

Rotten PRs close after 7d of inactivity.

Reopen the PR by commenting /reopen.
Mark the PR as fresh by commenting /remove-lifecycle rotten.

/close

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/ai Indicates the PR includes changes related to AI - Claude agents, Cursor rules, etc. area/api Indicates the PR includes changes for the API area/cli Indicates the PR includes changes for CLI area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release area/platform/aws PR/issue for AWS (AWSPlatform) platform area/platform/azure PR/issue for Azure (AzurePlatform) platform area/platform/gcp PR/issue for GCP (GCPPlatform) platform area/platform/ibmcloud PR/issue for IBMCloud (IBMCloudPlatform) platform area/platform/kubevirt PR/issue for KubeVirt (KubevirtPlatform) platform area/platform/openstack PR/issue for OpenStack (OpenStackPlatform) platform area/platform/powervs PR/issue for PowerVS (PowerVSPlatform) platform area/testing Indicates the PR includes changes for e2e testing do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants