OSDOCS-16991_j_2#Reconciling main and changes introduced in PR #11348 - #118841
Conversation
|
@brendan-daly-red-hat: This pull request references OSDOCS-16991 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "5.1.0" version, but no target version was set. DetailsIn response to this:
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. |
|
@brendan-daly-red-hat: No Jira issue is referenced in the title of this pull request. DetailsIn response to this:
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. |
|
🤖 Wed Aug 26 08:50:07 - Prow CI generated the docs preview: |
|
Just an FYI to others that this PR is a reconciliation between main and the changes that were introduced as part of #118348, which was a 4.20-based PR that was cherry picked to 4.21+ but the changes were not made in the main branch. This PR cherry picks the commit from the previous PR, so that main and all the 4.20+ enterprise branches are all as close as possible to each other. |
skopacz1
left a comment
There was a problem hiding this comment.
Left a few comments, the first one is for something you should not change in this PR but rather fix in a follow up after merging. The second one is something you must do in this PR (revert all the changes in modules/installation-aws-upload-custom-rhcos-ami.adoc)
| :_mod-docs-content-type: PROCEDURE | ||
| [id="installation-aws-creating-cloudformation-stack_{context}"] | ||
| = Creating the CloudFormation stack for compute machines | ||
| = Creating the `CloudFormation` stack for compute machines |
There was a problem hiding this comment.
This is technically correct to change because now this will align with the same change made in the enterprise branches.
However, more generally we shouldn't have monospace formatting in headings at all. So this should be kept in this PR for the sake of reconciliation, but then undone in a new 4.20+ PR that is based off of the main branch
(sorry if that sounds confusing, but I think in this PR we should just reconcile differences first, and make any 4.20+ revisions in a separate PR that can be cleanly cherry picked)
There was a problem hiding this comment.
TLDR revert every single change made in this file in this PR.
I actually merged a lot of changes to this file in main and 4.20+ as part of Silke's #118245. Merging this file as-is would create a discrepancy between main and enterprise branches rather than resolving them.
So for this fille:
- Revert all changes in this PR so this file doesn't show up in the diff at all
- If you still want to implement any of these changes, such as removing hard wrapping or adding attributes, please then make those changes in a clean 4.20+ PR based off of main, after merging this
a521036 to
d8f33a5
Compare
Cherry-picked from enterprise-4.20 PR openshift#118348 to main. Changes: - Replace callouts with 'where:' description lists per DITA migration - Improve procedural language (user-focused active voice) - Fix capitalization (kubelet not Kubelet) - Simplify wording ('Use' instead of 'It is recommended') Files: - modules/installation-approve-csrs.adoc - modules/installation-aws-creating-cloudformation-stack-compute.adoc - modules/installation-aws-regions-with-no-ami.adoc - modules/installation-aws-user-infra-installation.adoc
d8f33a5 to
406d2c8
Compare
|
@brendan-daly-red-hat: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
Version:
5.0+
Issue:
https://redhat.atlassian.net/browse/OSDOCS-16991
Link to docs preview:
Approving the certificate signing requests for your machines
Creating the CloudFormation stack for compute machines
AWS regions without a published RHCOS AMI
Completing an AWS installation on user-provisioned infrastructure
QE review:
Additional information: