OSDOCS#20799: adding TSR to OCP core preparing to update

[ousleyp]

Version(s): 4.22+, 5.0

Issue: OSDOCS-20799

Link to docs preview: https://116343--ocpdocs-pr.netlify.app/openshift-enterprise/latest/updating/preparing_for_updates/updating-cluster-prepare.html#about-self-service-tsr_updating-cluster-prepare

QE review:

• QE has approved this change.

Additional information: I'm following the lead of the existing content in this assembly WRT additional resources sections, but this may need to be changed for DITA compliance. got confirmation that this is OK actually, I'm going to add the links to the module itself in a different PR, so I'm removing the additional resources section from the assembly in anticipation of that. I'll be merging the other PR shortly merged the link change; build is updated

[ocpdocs-previewbot]

🤖 Fri Jul 24 15:36:52 - Prow CI generated the docs preview:
https://116343--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

[ahardin-rh]

LGTM. @ousleyp Thank you!

[openshift-ci]

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

[ousleyp]

/cherrypick enterprise-4.22

[ousleyp]

/cherrypick enterprise-5.0

[openshift-cherrypick-robot]

@ousleyp: #116343 failed to apply on top of branch "enterprise-5.0":

Applying: OSDOCS#20799: adding TSR to OCP core preparing to update
Using index info to reconstruct a base tree...
M	updating/preparing_for_updates/updating-cluster-prepare.adoc
Falling back to patching base and 3-way merge...
Auto-merging updating/preparing_for_updates/updating-cluster-prepare.adoc
CONFLICT (content): Merge conflict in updating/preparing_for_updates/updating-cluster-prepare.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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS#20799: adding TSR to OCP core preparing to update

Details

In response to this:

/cherrypick enterprise-5.0

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]

@ousleyp: #116343 failed to apply on top of branch "enterprise-4.22":

Applying: OSDOCS#20799: adding TSR to OCP core preparing to update
Using index info to reconstruct a base tree...
M	modules/about-self-service-tsr.adoc
M	updating/preparing_for_updates/updating-cluster-prepare.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/about-self-service-tsr.adoc
CONFLICT (content): Merge conflict in modules/about-self-service-tsr.adoc
Auto-merging updating/preparing_for_updates/updating-cluster-prepare.adoc
CONFLICT (content): Merge conflict in updating/preparing_for_updates/updating-cluster-prepare.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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS#20799: adding TSR to OCP core preparing to update

Details

In response to this:

/cherrypick enterprise-4.22

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.