OCPBUGS-78995: Azure: Default Marketplace image (for hive)

[2uasimojo]

In a path that should only be reachable from hive's MachinePool controller, if no RHCOS image reference was provided, we were defaulting to an empty capz.Image{} and letting MAO/MCO figure out what to use. This wasn't working very well.

Here we hardcode the oldest marketplace image in this path instead. This should end up being forward compatible; and the in-cluster operators should eventually be able to upgrade it as needed.

This is one part of a two-part solution. The other part entails hive improving its discovery of gallery images and (VM and image) HyperVGenerations, which will need to be in place when they vendor this change in.

Summary by CodeRabbit

• New Features
  • Azure machine deployments now select RHCOS images based on the target CPU architecture.
  • When no custom RHCOS image is provided, Azure marketplace defaults are chosen that match the architecture and generation (including ARM64 and V2 variants).
  • This ensures the installer resolves the correct marketplace image set for the selected hardware type.

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

@2uasimojo: This pull request references Jira Issue OCPBUGS-78995, which is invalid:

• expected the bug to target either version "5.0." or "openshift-5.0.", but it targets "4.22.0" instead

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:

In a path that should only be reachable from hive's MachinePool controller, if no RHCOS image reference was provided, we were defaulting to an empty capz.Image{} and letting MAO/MCO figure out what to use. This wasn't working very well.

Here we hardcode the oldest marketplace image in this path instead. This should end up being forward compatible; and the in-cluster operators should eventually be able to upgrade it as needed.

This is one part of a two-part solution. The other part entails hive improving its discovery of gallery images and (VM and image) HyperVGenerations, which will need to be in place when they vendor this change in.

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]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: c19afd79-2d27-4306-9b19-4736c5aa40bb

📥 Commits

Reviewing files that changed from the base of the PR and between 9ca5074 and 77cfd19.

📒 Files selected for processing (3)

• pkg/asset/installconfig/azure/capabilities.go
• pkg/asset/machines/azure/azuremachines.go
• pkg/asset/machines/azure/machines.go

🚧 Files skipped from review as they are similar to previous changes (3)

• pkg/asset/installconfig/azure/capabilities.go
• pkg/asset/machines/azure/machines.go
• pkg/asset/machines/azure/azuremachines.go

---

📝 Walkthrough

Walkthrough

Changes

Azure image selection

Layer / File(s)	Summary
Architecture resolution and propagation pkg/asset/installconfig/azure/capabilities.go, pkg/asset/machines/azure/machines.go, pkg/asset/machines/azure/azuremachines.go	Maps CpuArchitectureType to ARM64 or AMD64 and forwards the result through Azure machine image generation.
Marketplace RHCOS selection pkg/asset/machines/azure/azuremachines.go	When no custom RHCOS image is configured for a non-confidential VM, returns marketplace metadata with SKU selection based on architecture and VM generation.

Estimated code review effort: 3 (Moderate) | ~20 minutes

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly matches the main change: defaulting Azure to a marketplace image for Hive.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names	✅ Passed	The PR only changes Azure production code; no Ginkgo test declarations or titles were added or modified in the touched files.
Test Structure And Quality	✅ Passed	No Ginkgo test code was added or modified; the PR only changes production Azure image-selection logic.
Microshift Test Compatibility	✅ Passed	Only Azure helper/library code changed; no Ginkgo e2e tests or MicroShift-sensitive test markers were added.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	No new Ginkgo e2e tests were added; the PR only changes Azure machine/image plumbing, so the SNO test-compatibility check is not applicable.
Topology-Aware Scheduling Compatibility	✅ Passed	Only Azure VM image selection and architecture detection changed; no replicas, affinities, node selectors, or topology-spread constraints were added.
Ote Binary Stdout Contract	✅ Passed	The PR only changes library helpers and image-selection logic; no main/init/TestMain/suite setup or stdout/logging writes were added.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	No new Ginkgo e2e tests were added; the PR only changes Azure installer helper code, not test bodies.
No-Weak-Crypto	✅ Passed	No weak crypto, custom crypto, or secret-comparison logic appears in the touched Azure files; the patch only changes architecture/image selection.
Container-Privileges	✅ Passed	Only Go files changed; no container/K8s manifests or privilege settings were added, so the container-privileges check is not applicable.
No-Sensitive-Data-In-Logs	✅ Passed	No new log statements were added; the only existing log in the touched code logs only the instance type, not secrets/PII/internal hostnames.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 golangci-lint (2.12.2)

Error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions
The command is terminated due to an error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions

---

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

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

• pkg/asset/installconfig/azure/OWNERS
• pkg/asset/machines/azure/OWNERS

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

[coderabbitai]

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@pkg/asset/machines/azure/azuremachines.go`:
- Around line 403-422: Add table-driven tests covering the Azure
marketplace-image selection chain: test GetArchitecture, mapiImage/capzImage,
and GenerateMachines for Arm64 → 420-arm, AMD64 Gen2 → 420-v2, and AMD64
non-Gen2 → aro_420. Cover the affected flow across
pkg/asset/machines/azure/azuremachines.go (lines 403-422 and 66),
pkg/asset/installconfig/azure/capabilities.go (lines 51-58), and
pkg/asset/machines/azure/machines.go (lines 186 and 437-439); no production
changes are required unless needed to make these tests exercise the existing
mapping.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 7d98a00f-6276-4b2c-824b-0062d8917646

📥 Commits

Reviewing files that changed from the base of the PR and between b7140c7 and 9ca5074.

📒 Files selected for processing (3)

• pkg/asset/installconfig/azure/capabilities.go
• pkg/asset/machines/azure/azuremachines.go
• pkg/asset/machines/azure/machines.go

[2uasimojo]

/jira refresh

[openshift-ci-robot]

@2uasimojo: This pull request references Jira Issue OCPBUGS-78995, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (5.0.0) matches configured target version for branch (5.0.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Details

In response to this:

/jira refresh

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-robot]

@2uasimojo: This pull request references Jira Issue OCPBUGS-78995, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (5.0.0) matches configured target version for branch (5.0.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Details

In response to this:

In a path that should only be reachable from hive's MachinePool controller, if no RHCOS image reference was provided, we were defaulting to an empty capz.Image{} and letting MAO/MCO figure out what to use. This wasn't working very well.

Here we hardcode the oldest marketplace image in this path instead. This should end up being forward compatible; and the in-cluster operators should eventually be able to upgrade it as needed.

This is one part of a two-part solution. The other part entails hive improving its discovery of gallery images and (VM and image) HyperVGenerations, which will need to be in place when they vendor this change in.

Summary by CodeRabbit

• New Features
• Azure machine deployments now select RHCOS images based on the target CPU architecture.
• When no custom RHCOS image is provided, Azure marketplace defaults are chosen that match the architecture and generation (including ARM64 and V2 variants).
• This ensures the installer resolves the correct marketplace image set for the selected hardware type.

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.

[tthvo]

/retest

[openshift-ci]

@2uasimojo: 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.

[2uasimojo]

/hold

I think this has the potential to regress some edge cases. Still pondering design possibilities.

[2uasimojo]

/close

in favor of #10712.

[openshift-ci]

@2uasimojo: Closed this PR.

Details

In response to this:

/close

in favor of #10712.

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.

[openshift-ci-robot]

@2uasimojo: This pull request references Jira Issue OCPBUGS-78995. The bug has been updated to no longer refer to the pull request using the external bug tracker.

Details

In response to this:

In a path that should only be reachable from hive's MachinePool controller, if no RHCOS image reference was provided, we were defaulting to an empty capz.Image{} and letting MAO/MCO figure out what to use. This wasn't working very well.

Here we hardcode the oldest marketplace image in this path instead. This should end up being forward compatible; and the in-cluster operators should eventually be able to upgrade it as needed.

This is one part of a two-part solution. The other part entails hive improving its discovery of gallery images and (VM and image) HyperVGenerations, which will need to be in place when they vendor this change in.

Summary by CodeRabbit

• New Features
• Azure machine deployments now select RHCOS images based on the target CPU architecture.
• When no custom RHCOS image is provided, Azure marketplace defaults are chosen that match the architecture and generation (including ARM64 and V2 variants).
• This ensures the installer resolves the correct marketplace image set for the selected hardware type.

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.