Skip to content

CherryPicked: [cnv-4.22] [Storage/Network] Specify architecture for internal HTTP server for multiarch clusters - #5980

Open
cnv-tests-github-webhook-dollierp[bot] wants to merge 1 commit into
cnv-4.22from
CherryPicked-internal_http_server_arch-PYBCe
Open

CherryPicked: [cnv-4.22] [Storage/Network] Specify architecture for internal HTTP server for multiarch clusters#5980
cnv-tests-github-webhook-dollierp[bot] wants to merge 1 commit into
cnv-4.22from
CherryPicked-internal_http_server_arch-PYBCe

Conversation

@cnv-tests-github-webhook-dollierp

Copy link
Copy Markdown

Cherry-pick from main branch, original PR: #5813, PR owner: jpeimer

…ultiarch clusters (#5813)

On multi-arch clusters with a single `--cpu-arch` target, the internal
HTTP server pod could be scheduled on a node with the wrong
architecture.

  This PR:
- Adds a `nodeSelector` with `kubernetes.io/arch` to the internal HTTP
server Deployment so it lands on the correct architecture node.
- Extracts the duplicated `py_config["cpu_arch"] + cluster_type ==
MULTIARCH` check (repeated in `utilities/storage.py`,
`tests/storage/conftest.py`, and `libs/vm/factory.py`) into a single
`get_multiarch_cpu_arch()` function in `utilities/architecture.py`.

Failures on multi-arch clusters that run wit single requested arch.

<!-- full-ticket-url needs to be provided. This would add a link to the
pull request to the jira and close it when the pull request is merged
If the task is not tracked by a Jira ticket, just write "NONE".
-->

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

* **Bug Fixes**
* Improved multi-architecture cluster handling when creating virtual
machines and storage resources.
* Registry-based storage volumes now receive the appropriate CPU
architecture metadata.
* Storage deployments are scheduled onto compatible nodes when
architecture information is available.
* Improved consistency in default CPU architecture detection across
deployment workflows.
* Enhanced handling for environments where architecture information is
unavailable or not applicable.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Signed-off-by: Jenia Peimer <jpeimer@redhat.com>
@openshift-virtualization-qe-bot-6

Copy link
Copy Markdown

⚠️ This cherry-pick had conflicts resolved by AI (claude/claude-opus-4-6-1m)

@jpeimer — AI automatically resolved merge conflicts for this cherry-pick. Please review the changes carefully and verify correctness before merging.

@openshift-virtualization-qe-bot-5

Copy link
Copy Markdown

Report bugs in Issues

Welcome! 🎉

This pull request will be automatically processed with the following features:

🔄 Automatic Actions

  • Reviewer Assignment: Reviewers are automatically assigned based on the OWNERS file in the repository root
  • Size Labeling: PR size labels (XS, S, M, L, XL, XXL) are automatically applied based on changes
  • Issue Creation: A tracking issue is created for this PR and will be closed when the PR is merged or closed
  • Branch Labeling: Branch-specific labels are applied to track the target branch
  • Auto-verification: Auto-verified users have their PRs automatically marked as verified
  • Labels: Enabled categories: branch, can-be-merged, cherry-pick, has-conflicts, hold, needs-rebase, size, verified, wip

📋 Available Commands

PR Status Management

  • /wip - Mark PR as work in progress (adds WIP: prefix to title)
  • /wip cancel - Remove work in progress status
  • /hold - Block PR merging (PR author or approvers)
  • /hold cancel - Unblock PR merging (PR author or approvers)
  • /verified - Mark PR as verified
  • /verified cancel - Remove verification status
  • /reprocess - Trigger complete PR workflow reprocessing (useful if webhook failed or configuration changed)
  • /regenerate-welcome - Regenerate this welcome message
  • /security-override - Set security check runs to pass (maintainers only)
  • /security-override cancel - Re-run security checks

Review & Approval

  • /lgtm - Approve changes (looks good to me)
  • /approve - Approve PR (approvers only)
  • /assign-reviewers - Assign reviewers based on OWNERS file
  • /assign-reviewer @username - Assign specific reviewer
  • /check-can-merge - Check if PR meets merge requirements

Testing & Validation

  • /retest tox - Run Python test suite with tox
  • /retest build-container - Rebuild and test container image
  • /retest verify-bugs-are-open - verify-bugs-are-open
  • /retest all - Run all available tests

Container Operations

  • /build-and-push-container - Build and push container image (tagged with PR number)
    • Supports additional build arguments: /build-and-push-container --build-arg KEY=value

Cherry-pick Operations

  • /cherry-pick <branch> - Schedule cherry-pick to target branch when PR is merged
    • Multiple branches: /cherry-pick branch1 branch2 branch3
  • /cherry-pick-retry <branch> - Retry a failed cherry-pick (merged PRs only)

Branch Management

  • /rebase - Rebase this PR branch onto its base branch

Label Management

  • /<label-name> - Add a label to the PR
  • /<label-name> cancel - Remove a label from the PR

✅ Merge Requirements

This PR will be automatically approved when the following conditions are met:

  1. Approval: /approve from at least one approver
  2. LGTM Count: Minimum 2 /lgtm from reviewers
  3. Status Checks: All required status checks must pass
  4. No Blockers: No wip, hold, has-conflicts labels and PR must be mergeable (no conflicts)
  5. Verified: PR must be marked as verified

📊 Review Process

Approvers and Reviewers

Approvers:

  • EdDev
  • dshchedr
  • jpeimer
  • myakove
  • rnetser
  • vsibirsk

Reviewers:

  • Ahmad-Hafe
  • Anatw
  • EdDev
  • RoniKishner
  • acinko-rh
  • azhivovk
  • dalia-frank
  • dshchedr
  • ema-aka-young
  • frenzyfriday
  • geetikakay
  • josemacassan
  • jpeimer
  • kgoldbla
  • kshvaika
  • nirdothan
  • orelmisan
  • rnetser
  • servolkov
  • vsibirsk
  • yossisegev
Available Labels
  • hold
  • verified
  • wip
  • lgtm
  • approve
AI Features
  • Cherry-Pick Conflict Resolution: Enabled (claude/claude-opus-4-6-1m)
Security Checks
  • Suspicious Path Detection: Monitors paths: .claude/, .vscode/, .cursor/, .devcontainer/, .pi/, .github/workflows/, .github/actions/
  • Committer Identity Check: Verifies last committer matches PR author
  • Mandatory: Security checks block merge (use /security-override to bypass — maintainers only)

💡 Tips

  • WIP Status: Use /wip when your PR is not ready for review
  • Verification: The verified label is removed on new commits unless the push is detected as a clean rebase
  • Cherry-picking: Cherry-pick labels are processed when the PR is merged
  • Container Builds: Container images are automatically tagged with the PR number
  • Permission Levels: Some commands require approver permissions
  • Auto-verified Users: Certain users have automatic verification and merge privileges

📌 Additional Information

Custom Commands:

  • /test-plan — Triggers CodeRabbit to analyze the PR's changed files and post a test execution plan
  • /rerun-smoke — Adds retest-smoke label on the PR to trigger smoke tests execution

For more information, please refer to the project documentation or contact the maintainers.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants