Skip to content

OSDOCS 15615 Clarity on bootimage changes on AWS and GCP#97038

Merged
dfitzmau merged 1 commit intoopenshift:mainfrom
mburke5678:mco-boot-image-aws-example
Aug 7, 2025
Merged

OSDOCS 15615 Clarity on bootimage changes on AWS and GCP#97038
dfitzmau merged 1 commit intoopenshift:mainfrom
mburke5678:mco-boot-image-aws-example

Conversation

@mburke5678
Copy link
Contributor

@mburke5678 mburke5678 commented Aug 1, 2025

https://issues.redhat.com/browse/OSDOCS-15615

Link to docs preview:
About boot image management -- New note; new AWS machine set example.

No QE review needed of the following changes:
Enabling boot image management -- Moved verification bullet 2 to snippet.
Disabling boot image management -- Moved verification bullet 2 to snippet.

QE review:

  • QE has approved this change.

@mburke5678 mburke5678 added this to the Continuous Release milestone Aug 1, 2025
@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 1, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Aug 1, 2025

====

To view the current boot image used in your cluster, examine a machine set:
To view the current boot image used in your cluster, examine a machine set. The location and format of the boot image within the machine set differs, based on the platform. However, the boot image is always listed in the `spec.template.spec.providerSpec.` parameter.
Copy link

@djoshy djoshy Aug 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we can put this in one of those fancy "warning" boxes? So it is a bit more easy to notice than a regular paragraph. Content sounds good to me!

@mburke5678
Copy link
Contributor Author

@ptalgulk01 Can you PTAL?

@ptalgulk01
Copy link

looks good

@djoshy
Copy link

djoshy commented Aug 6, 2025

/lgtm from MCO POV!

@mburke5678 mburke5678 force-pushed the mco-boot-image-aws-example branch from 835b836 to 7faca38 Compare August 7, 2025 12:15
@mburke5678 mburke5678 added the merge-review-needed Signifies that the merge review team needs to review this PR label Aug 7, 2025
@openshift-ci
Copy link

openshift-ci bot commented Aug 7, 2025

@mburke5678: 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.

@dfitzmau dfitzmau removed the merge-review-needed Signifies that the merge review team needs to review this PR label Aug 7, 2025
.Example machine set with the boot image reference
[NOTE]
====
The location and format of the boot image within the machine set differs, based on the platform. However, the boot image is always listed in the `spec.template.spec.providerSpec.` parameter.
Copy link
Contributor

@dfitzmau dfitzmau Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
The location and format of the boot image within the machine set differs, based on the platform. However, the boot image is always listed in the `spec.template.spec.providerSpec.` parameter.
The location and format of the boot image within the machine set differs, based on the platform. However, the boot image is always listed in the `spec.template.spec.providerSpec` parameter.

Visually might look better. If this is possible? Maybe a follow-up PR if the change is valid. I won't hold up PR merging.

@dfitzmau dfitzmau added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Aug 7, 2025
@dfitzmau dfitzmau merged commit 7f527a5 into openshift:main Aug 7, 2025
2 checks passed
@dfitzmau
Copy link
Contributor

dfitzmau commented Aug 7, 2025

/cherrypick enterprise-4.20

@dfitzmau
Copy link
Contributor

dfitzmau commented Aug 7, 2025

/cherrypick enterprise-4.19

@dfitzmau
Copy link
Contributor

dfitzmau commented Aug 7, 2025

/cherrypick enterprise-4.18

@dfitzmau
Copy link
Contributor

dfitzmau commented Aug 7, 2025

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@dfitzmau: #97038 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS 15615 Clarity on bootimage changes on AWS and GCP
.git/rebase-apply/patch:17: trailing whitespace.
To view the current boot image used in your cluster, examine a machine set. 
.git/rebase-apply/patch:22: trailing whitespace.
The location and format of the boot image within the machine set differs, based on the platform. However, the boot image is always listed in the `spec.template.spec.providerSpec.` parameter. 
.git/rebase-apply/patch:155: trailing whitespace.
* Get the boot image version by running the following command. The location and format of the boot image within the machine set differs, based on the platform. However, the boot image is always listed in the `spec.template.spec.providerSpec.` parameter. 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
A	modules/mco-update-boot-images-about.adoc
M	modules/mco-update-boot-images-configuring.adoc
M	modules/mco-update-boot-images-disable.adoc
A	snippets/mco-update-boot-images-verification.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): snippets/mco-update-boot-images-verification.adoc deleted in HEAD and modified in OSDOCS 15615 Clarity on bootimage changes on AWS and GCP. Version OSDOCS 15615 Clarity on bootimage changes on AWS and GCP of snippets/mco-update-boot-images-verification.adoc left in tree.
Auto-merging modules/mco-update-boot-images-disable.adoc
CONFLICT (content): Merge conflict in modules/mco-update-boot-images-disable.adoc
Auto-merging modules/mco-update-boot-images-configuring.adoc
CONFLICT (content): Merge conflict in modules/mco-update-boot-images-configuring.adoc
CONFLICT (modify/delete): modules/mco-update-boot-images-about.adoc deleted in HEAD and modified in OSDOCS 15615 Clarity on bootimage changes on AWS and GCP. Version OSDOCS 15615 Clarity on bootimage changes on AWS and GCP of modules/mco-update-boot-images-about.adoc 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 OSDOCS 15615 Clarity on bootimage changes on AWS and GCP

Details

In response to this:

/cherrypick enterprise-4.18

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

@dfitzmau: #97038 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS 15615 Clarity on bootimage changes on AWS and GCP
.git/rebase-apply/patch:17: trailing whitespace.
To view the current boot image used in your cluster, examine a machine set. 
.git/rebase-apply/patch:22: trailing whitespace.
The location and format of the boot image within the machine set differs, based on the platform. However, the boot image is always listed in the `spec.template.spec.providerSpec.` parameter. 
.git/rebase-apply/patch:155: trailing whitespace.
* Get the boot image version by running the following command. The location and format of the boot image within the machine set differs, based on the platform. However, the boot image is always listed in the `spec.template.spec.providerSpec.` parameter. 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
A	modules/mco-update-boot-images-about.adoc
M	modules/mco-update-boot-images-configuring.adoc
M	modules/mco-update-boot-images-disable.adoc
A	snippets/mco-update-boot-images-verification.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): snippets/mco-update-boot-images-verification.adoc deleted in HEAD and modified in OSDOCS 15615 Clarity on bootimage changes on AWS and GCP. Version OSDOCS 15615 Clarity on bootimage changes on AWS and GCP of snippets/mco-update-boot-images-verification.adoc left in tree.
Auto-merging modules/mco-update-boot-images-disable.adoc
CONFLICT (content): Merge conflict in modules/mco-update-boot-images-disable.adoc
Auto-merging modules/mco-update-boot-images-configuring.adoc
CONFLICT (content): Merge conflict in modules/mco-update-boot-images-configuring.adoc
CONFLICT (modify/delete): modules/mco-update-boot-images-about.adoc deleted in HEAD and modified in OSDOCS 15615 Clarity on bootimage changes on AWS and GCP. Version OSDOCS 15615 Clarity on bootimage changes on AWS and GCP of modules/mco-update-boot-images-about.adoc 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 OSDOCS 15615 Clarity on bootimage changes on AWS and GCP

Details

In response to this:

/cherrypick enterprise-4.17

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

@dfitzmau: new pull request created: #97314

Details

In response to this:

/cherrypick enterprise-4.20

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

@dfitzmau: new pull request created: #97315

Details

In response to this:

/cherrypick enterprise-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.

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

Labels

branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 merge-review-in-progress Signifies that the merge review team is reviewing this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants