OCPBUGS-57803: MCO: consider custom AMI for edge compute machine pool

[tthvo]

If custom boot images are specified, the installer generates an MCO manifest to disable MCO boot image management (#9783).

On AWS, previously edge compute machine pool was not considered for custom AMI. This commit ensures custom AMI is considered in all compute machine pools.

[openshift-ci-robot]

@tthvo: This pull request references Jira Issue OCPBUGS-57348, which is invalid:

• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA 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:

If custom boot images are specified, the installer generates an MCO manifest to disable MCO boot image management (#9783).

On AWS, previously edge compute machine pool was not considered for custom AMI. This commit ensures custom AMI is considered in all compute machine pools.

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]

/cc @patrickdillon

[tthvo]

/retitle OCPBUGS-57803: consider custom AMI for edge compute machine pool

[openshift-ci-robot]

@tthvo: This pull request references Jira Issue OCPBUGS-57803, 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 (4.20.0) matches configured target version for branch (4.20.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @gpei

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

Details

In response to this:

If custom boot images are specified, the installer generates an MCO manifest to disable MCO boot image management (#9783).

On AWS, previously edge compute machine pool was not considered for custom AMI. This commit ensures custom AMI is considered in all compute machine pools.

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]

/retitle OCPBUGS-57803: MCO: consider custom AMI for edge compute machine pool

[tthvo]

/label platform/aws

[openshift-ci]

@tthvo: 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-vsphere-ovn-multi-network	59815ef	link	false	/test e2e-vsphere-ovn-multi-network
ci/prow/okd-scos-e2e-aws-ovn	59815ef	link	false	/test okd-scos-e2e-aws-ovn

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.

[patrickdillon]

/approve

This LGTM. Let's @mtulio a chance to review.

/cc @mtulio

Marco the background here (if you're not aware, which I wasn't until last week) the MCO has enabled boot image management in aws (& gcp). The bug is that if a user specifies a custom AMI in the install config, the MCO will overwrite it with the AMI from the rhcos stream. To fix it, the installer lays down an MCO configuration file to disable boot image management.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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

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

[patrickdillon]

Marco's on PTO.
/lgtm

[openshift-ci-robot]

@tthvo: Jira Issue OCPBUGS-57803: All pull requests linked via external trackers have merged:

• openshift/installer#9798

Jira Issue OCPBUGS-57803 has been moved to the MODIFIED state.

Details

In response to this:

If custom boot images are specified, the installer generates an MCO manifest to disable MCO boot image management (#9783).

On AWS, previously edge compute machine pool was not considered for custom AMI. This commit ensures custom AMI is considered in all compute machine pools.

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

[ART PR BUILD NOTIFIER]

Distgit: ose-installer
This PR has been included in build ose-installer-container-v4.20.0-202506201413.p0.g7b227fa.assembly.stream.el9.
All builds following this will include this PR.

[openshift-bot]

[ART PR BUILD NOTIFIER]

Distgit: ose-baremetal-installer
This PR has been included in build ose-baremetal-installer-container-v4.20.0-202506201413.p0.g7b227fa.assembly.stream.el9.
All builds following this will include this PR.

[openshift-bot]

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-artifacts
This PR has been included in build ose-installer-artifacts-container-v4.20.0-202506201413.p0.g7b227fa.assembly.stream.el9.
All builds following this will include this PR.

[gpei]

/cherry-pick release-4.19

[openshift-cherrypick-robot]

@gpei: #9798 failed to apply on top of branch "release-4.19":

Applying: OCPBUGS-57348: consider custom AMI for edge compute machine pool
Using index info to reconstruct a base tree...
A	pkg/asset/manifests/mco.go
A	pkg/asset/manifests/mco_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/asset/manifests/mco_test.go deleted in HEAD and modified in OCPBUGS-57348: consider custom AMI for edge compute machine pool. Version OCPBUGS-57348: consider custom AMI for edge compute machine pool of pkg/asset/manifests/mco_test.go left in tree.
CONFLICT (modify/delete): pkg/asset/manifests/mco.go deleted in HEAD and modified in OCPBUGS-57348: consider custom AMI for edge compute machine pool. Version OCPBUGS-57348: consider custom AMI for edge compute machine pool of pkg/asset/manifests/mco.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-57348: consider custom AMI for edge compute machine pool

Details

In response to this:

/cherry-pick release-4.19

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.

[gpei]

@tthvo looks like it may need a manual backport to 4.19 due to the conflicts.

[tthvo]

@tthvo looks like it may need a manual backport to 4.19 due to the conflicts.

@gpei I guess this change needs to be applied on top of #9797. I can try again asap after that PR is merged and do a manual backport if needed 😃

[tthvo]

/cherry-pick release-4.19

[openshift-cherrypick-robot]

@tthvo: new pull request created: #9807

Details

In response to this:

/cherry-pick release-4.19

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.