Skip to content

OCPBUGS#60416 There is one more wrong example in FROM clause of image layering docs #97433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 13, 2025

Conversation

palonsoro
Copy link
Contributor

@palonsoro palonsoro commented Aug 12, 2025

Fixed one more mistaken example of how the base image for RHCOS layering is expected to look like.

Version(s):

4.12 and higher up to latest.

Issue:

https://issues.redhat.com/browse/OCPBUGS-60416

Link to docs preview:

https://97433--ocpdocs-pr.netlify.app/openshift-enterprise/latest/machine_configuration/mco-coreos-layering.html

QE review:

  • QE has approved this change.

Additional information:

Continuation of OCPBUGS-33598, because there was one more example to fix.

… layering docs

Fixed one more mistaken example of how the base image for RHCOS layering
is expected to look like.
@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 12, 2025
@palonsoro
Copy link
Contributor Author

/retest

@ocpdocs-previewbot
Copy link

🤖 Tue Aug 12 12:45:22 - Prow CI generated the docs preview:

https://97433--ocpdocs-pr.netlify.app/openshift-enterprise/latest/machine_configuration/mco-coreos-layering.html

Copy link

openshift-ci bot commented Aug 12, 2025

@palonsoro: all tests passed!

Full PR test history. Your PR dashboard.

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.

@palonsoro
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Aug 12, 2025
@kalexand-rh
Copy link
Contributor

@jldohmann, can you tag a QE reviewer for this?

@jldohmann
Copy link
Contributor

@HuijingHei is this something you can PTAL for QE ack? thank you 😄

@jeana-redhat jeana-redhat added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Aug 12, 2025
Copy link
Contributor

@jeana-redhat jeana-redhat left a comment

Choose a reason for hiding this comment

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

Thanks so much @palonsoro! This looks good to me from a docs standards perspective, when QE acks this we can merge.

@jeana-redhat
Copy link
Contributor

Oh yeah - the PR says 4.12-4.19, but I assume this goes into 4.20 (unpublished) as well, right?

@jeana-redhat jeana-redhat added peer-review-done Signifies that the peer review team has reviewed this PR QE Required and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Aug 12, 2025
@palonsoro
Copy link
Contributor Author

Yes, also 4.20 (and any future version. I'll fix the description.

Copy link

@HuijingHei HuijingHei left a comment

Choose a reason for hiding this comment

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

LGTM

@jeana-redhat
Copy link
Contributor

Thanks @palonsoro and @HuijingHei!

@jeana-redhat jeana-redhat removed the peer-review-done Signifies that the peer review team has reviewed this PR label Aug 13, 2025
@jeana-redhat jeana-redhat merged commit 9c37db8 into openshift:main Aug 13, 2025
2 checks passed
@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16
/cherrypick enterprise-4.15
/cherrypick enterprise-4.14
/cherrypick enterprise-4.13
/cherrypick enterprise-4.12

@openshift-cherrypick-robot

@jeana-redhat: #97433 failed to apply on top of branch "enterprise-4.12":

Applying: OCPBUGS#60416 There is one more wrong example in FROM clause of image layering docs
Using index info to reconstruct a base tree...
M	modules/coreos-layering-configuring.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/coreos-layering-configuring.adoc
CONFLICT (content): Merge conflict in modules/coreos-layering-configuring.adoc
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#60416 There is one more wrong example in FROM clause of image layering docs

In response to this:

/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16
/cherrypick enterprise-4.15
/cherrypick enterprise-4.14
/cherrypick enterprise-4.13
/cherrypick enterprise-4.12

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.

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/cherrypick enterprise-4.18

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.17
/cherrypick enterprise-4.16
/cherrypick enterprise-4.15

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.14
/cherrypick enterprise-4.13

@openshift-cherrypick-robot

@jeana-redhat: new pull request created: #97494

In response to this:

/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/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

@jeana-redhat: new pull request created: #97495

In response to this:

/cherrypick enterprise-4.17
/cherrypick enterprise-4.16
/cherrypick enterprise-4.15

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

@jeana-redhat: new pull request created: #97496

In response to this:

/cherrypick enterprise-4.14
/cherrypick enterprise-4.13

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

@jeana-redhat: new pull request created: #97497

In response to this:

/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/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

@jeana-redhat: new pull request created: #97498

In response to this:

/cherrypick enterprise-4.17
/cherrypick enterprise-4.16
/cherrypick enterprise-4.15

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

@jeana-redhat: new pull request created: #97499

In response to this:

/cherrypick enterprise-4.14
/cherrypick enterprise-4.13

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

@jeana-redhat: new pull request created: #97500

In response to this:

/cherrypick enterprise-4.20
/cherrypick enterprise-4.19
/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

@jeana-redhat: new pull request created: #97501

In response to this:

/cherrypick enterprise-4.17
/cherrypick enterprise-4.16
/cherrypick enterprise-4.15

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.

@jeana-redhat
Copy link
Contributor

@palonsoro looks like everyone except 4.12 is going to cooperate. Are you able to open a manual backport into 4.12?

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.

7 participants