OSDOCS-17072-batch2 #101708

dfitzmau · 2025-11-04T15:42:28Z

PR splits out commands to individual code blocks for better alignment with the RH SSG requirements.

Version(s):
4.14+

Issue:
OSDOCS-17072

Preview links

Additional information:
code_block_results.txt

Next PR started from dr-hosted-cluster-within-aws-region-restore.adoc

ocpdocs-previewbot · 2025-11-04T15:56:15Z

🤖 Thu Nov 06 08:54:42 - Prow CI generated the docs preview:

https://101708--ocpdocs-pr.netlify.app/
https://101708--ocpdocs-pr.netlify.app/microshift/latest/microshift_networking/microshift-networking-settings.html
https://101708--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift-authentication.html
https://101708--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-olm.html
https://101708--ocpdocs-pr.netlify.app/openshift-enterprise/latest/hosted_control_planes/hcp_high_availability/hcp-disaster-recovery-aws.html

ShaunaDiaz

just a few nits for your consideration; nicely done

modules/microshift-security-context-constraints-opting.adoc

ShaunaDiaz · 2025-11-05T19:58:26Z

modules/dedicated-logging-in-and-verifying-permissions.adoc

 ----
 $ oc describe clusterrole.rbac dedicated-admins-cluster
+----
+


Suggested change

+

looks like these are part of the same step

modules/microshift-security-context-constraints-opting.adoc

openshift-ci · 2025-11-06T08:56:04Z

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

dfitzmau · 2025-11-06T09:12:27Z

/cherrypick enterprise-4.21

dfitzmau · 2025-11-06T09:12:32Z

/cherrypick enterprise-4.20

dfitzmau · 2025-11-06T09:12:35Z

/cherrypick enterprise-4.19

dfitzmau · 2025-11-06T09:12:38Z

/cherrypick enterprise-4.18

dfitzmau · 2025-11-06T09:12:42Z

/cherrypick enterprise-4.17

dfitzmau · 2025-11-06T09:12:45Z

/cherrypick enterprise-4.16

dfitzmau · 2025-11-06T09:12:48Z

/cherrypick enterprise-4.15

dfitzmau · 2025-11-06T09:12:52Z

/cherrypick enterprise-4.14

dfitzmau · 2025-11-06T09:12:55Z

/cherrypick enterprise-4.13

dfitzmau · 2025-11-06T09:12:58Z

/cherrypick enterprise-4.12

openshift-cherrypick-robot · 2025-11-06T09:13:18Z

@dfitzmau: new pull request created: #101853

In response to this:

/cherrypick enterprise-4.21

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 · 2025-11-06T09:13:21Z

@dfitzmau: #101708 failed to apply on top of branch "enterprise-4.19":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

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.

openshift-cherrypick-robot · 2025-11-06T09:13:22Z

@dfitzmau: new pull request created: #101854

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 · 2025-11-06T09:13:29Z

@dfitzmau: new pull request created: #101855

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 · 2025-11-06T09:13:34Z

@dfitzmau: new pull request created: #101856

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 · 2025-11-06T09:13:36Z

@dfitzmau: #101708 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-17072-batch2
Using index info to reconstruct a base tree...
M	modules/microshift-olm-deploy-ops-global-ns.adoc
M	modules/microshift-olm-deploy-ops-spec-ns.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-olm-deploy-ops-spec-ns.adoc
CONFLICT (content): Merge conflict in modules/microshift-olm-deploy-ops-spec-ns.adoc
Auto-merging modules/microshift-olm-deploy-ops-global-ns.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 OSDOCS-17072-batch2

In response to this:

/cherrypick enterprise-4.16

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 · 2025-11-06T09:13:40Z

@dfitzmau: #101708 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS-17072-batch2
Using index info to reconstruct a base tree...
M	modules/developer-cli-odo-ref-link.adoc
M	modules/developer-cli-odo-ref-storage.adoc
M	modules/microshift-olm-deploy-ops-global-ns.adoc
M	modules/microshift-olm-deploy-ops-spec-ns.adoc
M	modules/microshift-security-context-constraints-opting.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-security-context-constraints-opting.adoc
Auto-merging modules/microshift-olm-deploy-ops-spec-ns.adoc
CONFLICT (content): Merge conflict in modules/microshift-olm-deploy-ops-spec-ns.adoc
Auto-merging modules/microshift-olm-deploy-ops-global-ns.adoc
Auto-merging modules/developer-cli-odo-ref-storage.adoc
CONFLICT (content): Merge conflict in modules/developer-cli-odo-ref-storage.adoc
Auto-merging modules/developer-cli-odo-ref-link.adoc
CONFLICT (content): Merge conflict in modules/developer-cli-odo-ref-link.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 OSDOCS-17072-batch2

In response to this:

/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 · 2025-11-06T09:13:47Z

@dfitzmau: #101708 failed to apply on top of branch "enterprise-4.14":

Applying: OSDOCS-17072-batch2
Using index info to reconstruct a base tree...
M	modules/developer-cli-odo-ref-link.adoc
M	modules/developer-cli-odo-ref-storage.adoc
A	modules/microshift-olm-build-op-catalogs.adoc
A	modules/microshift-olm-deploy-ops-global-ns.adoc
A	modules/microshift-olm-deploy-ops-spec-ns.adoc
M	modules/microshift-rpm-ostree-https.adoc
M	modules/microshift-security-context-constraints-opting.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-security-context-constraints-opting.adoc
Auto-merging modules/microshift-rpm-ostree-https.adoc
CONFLICT (modify/delete): modules/microshift-olm-deploy-ops-spec-ns.adoc deleted in HEAD and modified in OSDOCS-17072-batch2. Version OSDOCS-17072-batch2 of modules/microshift-olm-deploy-ops-spec-ns.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-olm-deploy-ops-global-ns.adoc deleted in HEAD and modified in OSDOCS-17072-batch2. Version OSDOCS-17072-batch2 of modules/microshift-olm-deploy-ops-global-ns.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-olm-build-op-catalogs.adoc deleted in HEAD and modified in OSDOCS-17072-batch2. Version OSDOCS-17072-batch2 of modules/microshift-olm-build-op-catalogs.adoc left in tree.
Auto-merging modules/developer-cli-odo-ref-storage.adoc
CONFLICT (content): Merge conflict in modules/developer-cli-odo-ref-storage.adoc
Auto-merging modules/developer-cli-odo-ref-link.adoc
CONFLICT (content): Merge conflict in modules/developer-cli-odo-ref-link.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 OSDOCS-17072-batch2

In response to this:

/cherrypick enterprise-4.14

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 · 2025-11-06T09:13:51Z

@dfitzmau: #101708 failed to apply on top of branch "enterprise-4.13":

Applying: OSDOCS-17072-batch2
Using index info to reconstruct a base tree...
M	modules/developer-cli-odo-installing-odo-on-linux.adoc
M	modules/developer-cli-odo-ref-link.adoc
M	modules/developer-cli-odo-ref-storage.adoc
M	modules/dr-hosted-cluster-within-aws-region-delete.adoc
M	modules/dr-hosted-cluster-within-aws-region-restore.adoc
A	modules/microshift-olm-build-op-catalogs.adoc
A	modules/microshift-olm-deploy-ops-global-ns.adoc
A	modules/microshift-olm-deploy-ops-spec-ns.adoc
M	modules/microshift-rpm-ostree-https.adoc
A	modules/microshift-security-context-constraints-opting.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/microshift-security-context-constraints-opting.adoc deleted in HEAD and modified in OSDOCS-17072-batch2. Version OSDOCS-17072-batch2 of modules/microshift-security-context-constraints-opting.adoc left in tree.
Auto-merging modules/microshift-rpm-ostree-https.adoc
CONFLICT (content): Merge conflict in modules/microshift-rpm-ostree-https.adoc
CONFLICT (modify/delete): modules/microshift-olm-deploy-ops-spec-ns.adoc deleted in HEAD and modified in OSDOCS-17072-batch2. Version OSDOCS-17072-batch2 of modules/microshift-olm-deploy-ops-spec-ns.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-olm-deploy-ops-global-ns.adoc deleted in HEAD and modified in OSDOCS-17072-batch2. Version OSDOCS-17072-batch2 of modules/microshift-olm-deploy-ops-global-ns.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-olm-build-op-catalogs.adoc deleted in HEAD and modified in OSDOCS-17072-batch2. Version OSDOCS-17072-batch2 of modules/microshift-olm-build-op-catalogs.adoc left in tree.
Auto-merging modules/dr-hosted-cluster-within-aws-region-restore.adoc
Auto-merging modules/dr-hosted-cluster-within-aws-region-delete.adoc
Auto-merging modules/developer-cli-odo-ref-storage.adoc
CONFLICT (content): Merge conflict in modules/developer-cli-odo-ref-storage.adoc
Auto-merging modules/developer-cli-odo-ref-link.adoc
CONFLICT (content): Merge conflict in modules/developer-cli-odo-ref-link.adoc
Auto-merging modules/developer-cli-odo-installing-odo-on-linux.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 OSDOCS-17072-batch2

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-sigs/prow repository.

openshift-cherrypick-robot · 2025-11-06T09:13:54Z

@dfitzmau: #101708 failed to apply on top of branch "enterprise-4.12":

Applying: OSDOCS-17072-batch2
Using index info to reconstruct a base tree...
M	modules/developer-cli-odo-installing-odo-on-linux.adoc
M	modules/developer-cli-odo-ref-link.adoc
M	modules/developer-cli-odo-ref-storage.adoc
M	modules/dr-hosted-cluster-within-aws-region-delete.adoc
M	modules/dr-hosted-cluster-within-aws-region-restore.adoc
A	modules/microshift-olm-build-op-catalogs.adoc
A	modules/microshift-olm-deploy-ops-global-ns.adoc
A	modules/microshift-olm-deploy-ops-spec-ns.adoc
A	modules/microshift-rpm-ostree-https.adoc
A	modules/microshift-security-context-constraints-opting.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/microshift-security-context-constraints-opting.adoc deleted in HEAD and modified in OSDOCS-17072-batch2. Version OSDOCS-17072-batch2 of modules/microshift-security-context-constraints-opting.adoc left in tree.
Auto-merging modules/microshift-rpm-ostree.adoc
CONFLICT (content): Merge conflict in modules/microshift-rpm-ostree.adoc
CONFLICT (modify/delete): modules/microshift-olm-deploy-ops-spec-ns.adoc deleted in HEAD and modified in OSDOCS-17072-batch2. Version OSDOCS-17072-batch2 of modules/microshift-olm-deploy-ops-spec-ns.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-olm-deploy-ops-global-ns.adoc deleted in HEAD and modified in OSDOCS-17072-batch2. Version OSDOCS-17072-batch2 of modules/microshift-olm-deploy-ops-global-ns.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-olm-build-op-catalogs.adoc deleted in HEAD and modified in OSDOCS-17072-batch2. Version OSDOCS-17072-batch2 of modules/microshift-olm-build-op-catalogs.adoc left in tree.
Auto-merging modules/dr-hosted-cluster-within-aws-region-restore.adoc
Auto-merging modules/dr-hosted-cluster-within-aws-region-delete.adoc
Auto-merging modules/developer-cli-odo-ref-storage.adoc
CONFLICT (content): Merge conflict in modules/developer-cli-odo-ref-storage.adoc
Auto-merging modules/developer-cli-odo-ref-link.adoc
CONFLICT (content): Merge conflict in modules/developer-cli-odo-ref-link.adoc
Auto-merging modules/developer-cli-odo-installing-odo-on-linux.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 OSDOCS-17072-batch2

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-sigs/prow repository.

dfitzmau · 2025-11-06T09:15:18Z

/cherrypick enterprise-4.19

openshift-cherrypick-robot · 2025-11-06T09:16:08Z

@dfitzmau: new pull request created: #101857

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.

openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 4, 2025

dfitzmau force-pushed the OSDOCS-17072-batch2 branch 2 times, most recently from 0f9e4da to 07e5d44 Compare November 4, 2025 16:53

dfitzmau added branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 labels Nov 4, 2025

dfitzmau force-pushed the OSDOCS-17072-batch2 branch 2 times, most recently from 9c794a7 to f363484 Compare November 5, 2025 10:03

dfitzmau added the merge-review-needed Signifies that the merge review team needs to review this PR label Nov 5, 2025

ShaunaDiaz removed the merge-review-needed Signifies that the merge review team needs to review this PR label Nov 5, 2025

ShaunaDiaz reviewed Nov 5, 2025

View reviewed changes

OSDOCS-17072-batch2

91ede8d

dfitzmau force-pushed the OSDOCS-17072-batch2 branch from f363484 to 91ede8d Compare November 6, 2025 08:30

dfitzmau merged commit 5feec07 into openshift:main Nov 6, 2025
2 checks passed

openshift-cherrypick-robot mentioned this pull request Nov 6, 2025

[enterprise-4.21] OSDOCS-17072-batch2 #101853

Merged

openshift-cherrypick-robot mentioned this pull request Nov 6, 2025

[enterprise-4.20] OSDOCS-17072-batch2 #101854

Merged

openshift-cherrypick-robot mentioned this pull request Nov 6, 2025

[enterprise-4.18] OSDOCS-17072-batch2 #101855

Merged

openshift-cherrypick-robot mentioned this pull request Nov 6, 2025

[enterprise-4.17] OSDOCS-17072-batch2 #101856

Merged

openshift-cherrypick-robot mentioned this pull request Nov 6, 2025

[enterprise-4.19] OSDOCS-17072-batch2 #101857

Merged

OSDOCS-17072-batch2 #101708

OSDOCS-17072-batch2 #101708

Uh oh!

Conversation

dfitzmau commented Nov 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ocpdocs-previewbot commented Nov 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ShaunaDiaz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ShaunaDiaz Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

openshift-ci bot commented Nov 6, 2025

Uh oh!

Uh oh!

dfitzmau commented Nov 6, 2025

Uh oh!

dfitzmau commented Nov 6, 2025

Uh oh!

dfitzmau commented Nov 6, 2025

Uh oh!

dfitzmau commented Nov 6, 2025

Uh oh!

dfitzmau commented Nov 6, 2025

Uh oh!

dfitzmau commented Nov 6, 2025

Uh oh!

dfitzmau commented Nov 6, 2025

Uh oh!

dfitzmau commented Nov 6, 2025

Uh oh!

dfitzmau commented Nov 6, 2025

Uh oh!

dfitzmau commented Nov 6, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 6, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 6, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 6, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 6, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 6, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 6, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 6, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 6, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 6, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 6, 2025

Uh oh!

dfitzmau commented Nov 6, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 6, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dfitzmau commented Nov 4, 2025 •

edited

Loading

ocpdocs-previewbot commented Nov 4, 2025 •

edited

Loading