Skip to content
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

OSDOCS-4872: change variant rhcos to openshift #58302

Merged
merged 1 commit into from
Apr 17, 2023

Conversation

jldohmann
Copy link
Contributor

@jldohmann jldohmann commented Apr 5, 2023

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 5, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 5, 2023

@jldohmann: This pull request references OSDOCS-4872 which is a valid jira issue.

In response to this:

Version(s): 4.12+

Issue: https://issues.redhat.com/browse/OSDOCS-4872

Link to docs preview: http://file.rdu.redhat.com/jdohmann/OSDOCS-4872/installing/installing_sno/install-sno-installing-sno.html#create-custom-live-rhcos-iso_install-sno-installing-sno-with-the-assisted-installer

QE review:

  • QE has approved this change.

Additional information:

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/test-infra repository.

@jldohmann jldohmann added this to the Continuous Release milestone Apr 5, 2023
@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 5, 2023
@jldohmann jldohmann added the peer-review-needed Signifies that the peer review team needs to review this PR label Apr 5, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Apr 5, 2023

🤖 Updated build preview is available at:
https://58302--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/14173

@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 5, 2023
@jldohmann jldohmann removed the peer-review-needed Signifies that the peer review team needs to review this PR label Apr 5, 2023
@jldohmann jldohmann added the peer-review-needed Signifies that the peer review team needs to review this PR label Apr 5, 2023
@jldohmann
Copy link
Contributor Author

@mike-nguyen could you PTAL for QE ack? this updates the SNO docs to reflect the changes in Butane support. it doesn't look like these docs existed pre-4.12, so i've marked them as 4.12+

@mike-nguyen
Copy link
Member

I'm not too familiar with single node mode so I can't comment on the dropping of root ssh login. If SNO is more like OCP now with only allowing core user login then the changes LGTM. Do you know if SNO has QE that can look over these changes?

@maxwelldb maxwelldb added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Apr 6, 2023
@maxwelldb maxwelldb self-requested a review April 6, 2023 13:38
Copy link
Contributor

@maxwelldb maxwelldb left a comment

Choose a reason for hiding this comment

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

Looking pretty good. One question for you, as well as two suggested changes for while you're working on the file.

modules/creating-custom-live-rhcos-iso.adoc Show resolved Hide resolved
modules/creating-custom-live-rhcos-iso.adoc Outdated Show resolved Hide resolved
modules/creating-custom-live-rhcos-iso.adoc Outdated Show resolved Hide resolved
@maxwelldb maxwelldb added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Apr 6, 2023
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 6, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 6, 2023
@jldohmann
Copy link
Contributor Author

jldohmann commented Apr 6, 2023

4621c33..aeb7429 implement peer review feedback
aeb7429..290499c rebase
290499c..04bdd8b implement QE feedback pt.1
04bdd8b..dd15d62 implement QE feedback pt.2
dd15d62..003269e reverse {product-version} in link macro back to 4.12

@jldohmann
Copy link
Contributor Author

@yunjiang29 could you PTAL for QE ack, or do you know who could take a look for QE ack? this PR updates the SNO docs to reflect the changes in Butane support. thank you!

Copy link

@sgoveas sgoveas left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 14, 2023

@jldohmann: This pull request references OSDOCS-4872 which is a valid jira issue.

In response to this:

Version(s): 4.12+

Issue: https://issues.redhat.com/browse/OSDOCS-4872

Link to docs preview: http://file.rdu.redhat.com/jdohmann/OSDOCS-4872/installing/installing_sno/install-sno-installing-sno.html#create-custom-live-rhcos-iso_install-sno-installing-sno-with-the-assisted-installer

QE review:

  • QE has approved this change.

Additional information:

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/test-infra repository.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2023
@openshift-ci
Copy link

openshift-ci bot commented Apr 14, 2023

New changes are detected. LGTM label has been removed.

@jldohmann
Copy link
Contributor Author

jldohmann commented Apr 14, 2023

I am leaving the hardcoded 4.12 version in the link macro but will apply cherrypicks with a CIT to return back and fix for 4.13. The issue with using {product-version} in its place is detailed here

@jldohmann jldohmann merged commit 8e49dce into openshift:main Apr 17, 2023
@jldohmann
Copy link
Contributor Author

/cherrypick enterprise-4.13

@jldohmann
Copy link
Contributor Author

/cherrypick enterprise-4.12

@openshift-cherrypick-robot

@jldohmann: new pull request created: #58847

In response to this:

/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/test-infra repository.

@openshift-cherrypick-robot

@jldohmann: #58302 failed to apply on top of branch "enterprise-4.12":

Applying: OSDOCS-4872: change variant rhcos to openshift
Using index info to reconstruct a base tree...
M	modules/creating-custom-live-rhcos-iso.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/creating-custom-live-rhcos-iso.adoc
CONFLICT (content): Merge conflict in modules/creating-custom-live-rhcos-iso.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OSDOCS-4872: change variant rhcos to openshift
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.12 branch/enterprise-4.13 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants