OSDOCS-17072-batch6 #102543

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.

Sign up for GitHub

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

Jump to bottom

Merged

dfitzmau merged 1 commit into openshift:main from dfitzmau:OSDOCS-17072-batch6

Nov 17, 2025

Contributor

dfitzmau commented Nov 14, 2025 •

edited

Loading

PR splits out commands to individual code blocks for better alignment with the RH SSG requirements. This is the last batch of fixes.

Version(s):
4.14+

Issue:
OSDOCS-17072

Links:

openshift-ci bot added the size/L label

dfitzmau force-pushed the OSDOCS-17072-batch6 branch from 199701d to 0139df8 Compare

November 14, 2025 15:23

ocpdocs-previewbot commented Nov 14, 2025 •

edited

Loading

🤖 Mon Nov 17 09:29:35 - Prow CI generated the docs preview:
https://102543--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

dfitzmau added branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 merge-review-needed labels

lahinson added merge-review-in-progress and removed merge-review-needed labels

lahinson reviewed

View reviewed changes

Contributor

lahinson left a comment

@dfitzmau I spotted a couple of formatting things that you might want to double-check. Feel free to merge when you're ready.

modules/preparing-aws-credentials-for-oadp.adoc Show resolved Hide resolved

modules/preparing-aws-sts-credentials-for-oadp.adoc Show resolved Hide resolved

modules/rhcos-enabling-multipath.adoc Show resolved Hide resolved

modules/rhcos-enabling-multipath.adoc Show resolved Hide resolved

modules/update-release-images.adoc Outdated Show resolved Hide resolved

lahinson added ok-to-merge and removed merge-review-in-progress labels

dfitzmau force-pushed the OSDOCS-17072-batch6 branch 3 times, most recently from fe3ac54 to 3daf341 Compare

November 17, 2025 08:53


          OSDOCS-17072-batch6

870dfb7

dfitzmau force-pushed the OSDOCS-17072-batch6 branch from 3daf341 to 870dfb7 Compare

November 17, 2025 09:17

openshift-ci bot commented Nov 17, 2025

@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 merged commit 99878ec into openshift:main

2 checks passed

Contributor Author

dfitzmau commented Nov 17, 2025

/cherrypick enterprise-4.21

Contributor Author

dfitzmau commented Nov 17, 2025

/cherrypick enterprise-4.20

Contributor Author

dfitzmau commented Nov 17, 2025

/cherrypick enterprise-4.19

Contributor Author

dfitzmau commented Nov 17, 2025

/cherrypick enterprise-4.18

Contributor Author

dfitzmau commented Nov 17, 2025

/cherrypick enterprise-4.17

Contributor Author

dfitzmau commented Nov 17, 2025

/cherrypick enterprise-4.16

Contributor Author

dfitzmau commented Nov 17, 2025

/cherrypick enterprise-4.15

Contributor Author

dfitzmau commented Nov 17, 2025

/cherrypick enterprise-4.14

openshift-cherrypick-robot commented Nov 17, 2025

@dfitzmau: new pull request created: #102596

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 mentioned this pull request

[enterprise-4.21] OSDOCS-17072-batch6 #102596

Merged

openshift-cherrypick-robot commented Nov 17, 2025

@dfitzmau: new pull request created: #102597

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 mentioned this pull request

[enterprise-4.20] OSDOCS-17072-batch6 #102597

Merged

openshift-cherrypick-robot commented Nov 17, 2025

@dfitzmau: new pull request created: #102598

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 mentioned this pull request

[enterprise-4.19] OSDOCS-17072-batch6 #102598

Merged

openshift-cherrypick-robot commented Nov 17, 2025

@dfitzmau: #102543 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS-17072-batch6
Using index info to reconstruct a base tree...
M	modules/oadp-using-ca-certificates-with-velero-command.adoc
A	modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc
M	modules/preparing-aws-credentials-for-oadp.adoc
M	modules/rosa-creating-node-tuning.adoc
M	modules/rosa-quickstart-instructions.adoc
M	modules/virt-configuring-vm-with-node-exporter-service.adoc
A	modules/zero-trust-manager-config-azure-identity.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/zero-trust-manager-config-azure-identity.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/zero-trust-manager-config-azure-identity.adoc left in tree.
Auto-merging modules/virt-configuring-vm-with-node-exporter-service.adoc
Auto-merging modules/rosa-quickstart-instructions.adoc
Auto-merging modules/rosa-creating-node-tuning.adoc
Auto-merging modules/preparing-aws-credentials-for-oadp.adoc
CONFLICT (content): Merge conflict in modules/preparing-aws-credentials-for-oadp.adoc
CONFLICT (modify/delete): modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc left in tree.
Auto-merging modules/oadp-using-ca-certificates-with-velero-command.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-batch6

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 commented Nov 17, 2025

@dfitzmau: #102543 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS-17072-batch6
Using index info to reconstruct a base tree...
M	modules/oadp-using-ca-certificates-with-velero-command.adoc
A	modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc
M	modules/preparing-aws-credentials-for-oadp.adoc
A	modules/rdma-creating-persistent-naming-rules.adoc
M	modules/rhcos-enabling-multipath.adoc
M	modules/rosa-creating-node-tuning.adoc
M	modules/rosa-quickstart-instructions.adoc
A	modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc
M	modules/virt-configuring-vm-with-node-exporter-service.adoc
A	modules/zero-trust-manager-config-azure-identity.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/zero-trust-manager-config-azure-identity.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/zero-trust-manager-config-azure-identity.adoc left in tree.
Auto-merging modules/virt-configuring-vm-with-node-exporter-service.adoc
CONFLICT (modify/delete): modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc left in tree.
Auto-merging modules/rosa-quickstart-instructions.adoc
Auto-merging modules/rosa-creating-node-tuning.adoc
Auto-merging modules/rhcos-enabling-multipath.adoc
CONFLICT (content): Merge conflict in modules/rhcos-enabling-multipath.adoc
CONFLICT (modify/delete): modules/rdma-creating-persistent-naming-rules.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/rdma-creating-persistent-naming-rules.adoc left in tree.
Auto-merging modules/preparing-aws-credentials-for-oadp.adoc
CONFLICT (content): Merge conflict in modules/preparing-aws-credentials-for-oadp.adoc
CONFLICT (modify/delete): modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc left in tree.
Auto-merging modules/oadp-using-ca-certificates-with-velero-command.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-batch6

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 commented Nov 17, 2025

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

Applying: OSDOCS-17072-batch6
Using index info to reconstruct a base tree...
M	modules/oadp-using-ca-certificates-with-velero-command.adoc
A	modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc
M	modules/preparing-aws-credentials-for-oadp.adoc
M	modules/querying-cluster-node-journal-logs.adoc
A	modules/rdma-creating-persistent-naming-rules.adoc
M	modules/rhcos-enabling-multipath.adoc
M	modules/rosa-creating-node-tuning.adoc
M	modules/rosa-quickstart-instructions.adoc
A	modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc
M	modules/virt-configuring-vm-with-node-exporter-service.adoc
A	modules/zero-trust-manager-config-azure-identity.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/zero-trust-manager-config-azure-identity.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/zero-trust-manager-config-azure-identity.adoc left in tree.
Auto-merging modules/virt-configuring-vm-with-node-exporter-service.adoc
CONFLICT (modify/delete): modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc left in tree.
Auto-merging modules/rosa-quickstart-instructions.adoc
Auto-merging modules/rosa-creating-node-tuning.adoc
Auto-merging modules/rhcos-enabling-multipath.adoc
CONFLICT (content): Merge conflict in modules/rhcos-enabling-multipath.adoc
CONFLICT (modify/delete): modules/rdma-creating-persistent-naming-rules.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/rdma-creating-persistent-naming-rules.adoc left in tree.
Auto-merging modules/querying-cluster-node-journal-logs.adoc
CONFLICT (content): Merge conflict in modules/querying-cluster-node-journal-logs.adoc
Auto-merging modules/preparing-aws-credentials-for-oadp.adoc
CONFLICT (content): Merge conflict in modules/preparing-aws-credentials-for-oadp.adoc
CONFLICT (modify/delete): modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc left in tree.
Auto-merging modules/oadp-using-ca-certificates-with-velero-command.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-batch6

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 commented Nov 17, 2025

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

Applying: OSDOCS-17072-batch6
Using index info to reconstruct a base tree...
M	modules/oadp-using-ca-certificates-with-velero-command.adoc
A	modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc
M	modules/preparing-aws-credentials-for-oadp.adoc
M	modules/querying-cluster-node-journal-logs.adoc
A	modules/rdma-creating-persistent-naming-rules.adoc
M	modules/rhcos-enabling-multipath.adoc
M	modules/rosa-creating-node-tuning.adoc
M	modules/rosa-quickstart-instructions.adoc
A	modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc
M	modules/virt-configuring-vm-with-node-exporter-service.adoc
A	modules/zero-trust-manager-config-azure-identity.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/zero-trust-manager-config-azure-identity.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/zero-trust-manager-config-azure-identity.adoc left in tree.
Auto-merging modules/virt-configuring-vm-with-node-exporter-service.adoc
CONFLICT (modify/delete): modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc left in tree.
Auto-merging modules/rosa-quickstart-instructions.adoc
Auto-merging modules/rosa-creating-node-tuning.adoc
Auto-merging modules/rhcos-enabling-multipath.adoc
CONFLICT (content): Merge conflict in modules/rhcos-enabling-multipath.adoc
CONFLICT (modify/delete): modules/rdma-creating-persistent-naming-rules.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/rdma-creating-persistent-naming-rules.adoc left in tree.
Auto-merging modules/querying-cluster-node-journal-logs.adoc
CONFLICT (content): Merge conflict in modules/querying-cluster-node-journal-logs.adoc
Auto-merging modules/preparing-aws-credentials-for-oadp.adoc
CONFLICT (content): Merge conflict in modules/preparing-aws-credentials-for-oadp.adoc
CONFLICT (modify/delete): modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc left in tree.
Auto-merging modules/oadp-using-ca-certificates-with-velero-command.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-batch6

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 commented Nov 17, 2025

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

Applying: OSDOCS-17072-batch6
Using index info to reconstruct a base tree...
M	modules/oadp-using-ca-certificates-with-velero-command.adoc
A	modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc
M	modules/preparing-aws-credentials-for-oadp.adoc
M	modules/querying-cluster-node-journal-logs.adoc
A	modules/rdma-creating-persistent-naming-rules.adoc
M	modules/rhcos-enabling-multipath.adoc
M	modules/rosa-creating-node-tuning.adoc
M	modules/rosa-quickstart-instructions.adoc
A	modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc
M	modules/virt-configuring-vm-with-node-exporter-service.adoc
A	modules/zero-trust-manager-config-azure-identity.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/zero-trust-manager-config-azure-identity.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/zero-trust-manager-config-azure-identity.adoc left in tree.
Auto-merging modules/virt-configuring-vm-with-node-exporter-service.adoc
CONFLICT (modify/delete): modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/rosa-troubleshooting-awsinsufficientpermission-failure-deployment.adoc left in tree.
Auto-merging modules/rosa-quickstart-instructions.adoc
Auto-merging modules/rosa-creating-node-tuning.adoc
CONFLICT (content): Merge conflict in modules/rosa-creating-node-tuning.adoc
Auto-merging modules/rhcos-enabling-multipath.adoc
CONFLICT (content): Merge conflict in modules/rhcos-enabling-multipath.adoc
CONFLICT (modify/delete): modules/rdma-creating-persistent-naming-rules.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/rdma-creating-persistent-naming-rules.adoc left in tree.
Auto-merging modules/querying-cluster-node-journal-logs.adoc
CONFLICT (content): Merge conflict in modules/querying-cluster-node-journal-logs.adoc
Auto-merging modules/preparing-aws-credentials-for-oadp.adoc
CONFLICT (content): Merge conflict in modules/preparing-aws-credentials-for-oadp.adoc
CONFLICT (modify/delete): modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc deleted in HEAD and modified in OSDOCS-17072-batch6. Version OSDOCS-17072-batch6 of modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc left in tree.
Auto-merging modules/oadp-using-ca-certificates-with-velero-command.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-batch6

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.

This was referenced Nov 17, 2025

[enterprise-4.18] OSDOCS-17072-batch6 #102599

Merged

[enterprise-4.17] OSDOCS-17072-batch6 #102600

Merged

[enterprise-4.16] OSDOCS-17072-batch6 #102601

Merged

[enterprise-4.15] OSDOCS-17072-batch6 #102602

Merged

[enterprise-4.14] OSDOCS-17072-batch6 #102603

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 ok-to-merge size/L