Skip to content

Conversation

@dfitzmau
Copy link
Contributor

@dfitzmau dfitzmau commented Nov 10, 2025

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 10, 2025
@dfitzmau dfitzmau force-pushed the OSDOCS-17072-batch5 branch from f032c43 to d7587f0 Compare November 10, 2025 16:09
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 10, 2025
@dfitzmau dfitzmau force-pushed the OSDOCS-17072-batch5 branch 2 times, most recently from 1786b31 to 23358c3 Compare November 10, 2025 16:17
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Nov 10, 2025

🤖 Wed Nov 12 09:21:34 - Prow CI generated the docs preview:
https://102122--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@lahinson lahinson added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Nov 11, 2025
Copy link
Contributor

@lahinson lahinson left a comment

Choose a reason for hiding this comment

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

@dfitzmau Just one nit. I'll leave this to you to merge.

====
+
* Create the pod by running the following command:
.. Create the pod by running the following command:
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
.. Create the pod by running the following command:
.. Create the pod by running the following command:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

✔️

@lahinson lahinson added ok-to-merge and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR labels Nov 11, 2025
@dfitzmau dfitzmau force-pushed the OSDOCS-17072-batch5 branch from 23358c3 to d8e2dc3 Compare November 12, 2025 09:07
@openshift-ci
Copy link

openshift-ci bot commented Nov 12, 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 dfitzmau merged commit 8333871 into openshift:main Nov 12, 2025
2 checks passed
@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.21

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.20

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.19

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.18

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.17

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.16

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.15

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@dfitzmau: new pull request created: #102352

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

@dfitzmau: new pull request created: #102353

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

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

Applying: OSDOCS-17072-batch5
.git/rebase-apply/patch:127: trailing whitespace.
.. Create a YAML file named `fuse-builder-pod.yaml` with the following content: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/modifying-an-existing-ingress-controller.adoc
M	modules/oadp-using-ca-certificates-with-velero-command.adoc
M	modules/ossm-migrating-to-20.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ossm-migrating-to-20.adoc
Auto-merging modules/oadp-using-ca-certificates-with-velero-command.adoc
Auto-merging modules/modifying-an-existing-ingress-controller.adoc
CONFLICT (content): Merge conflict in modules/modifying-an-existing-ingress-controller.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-batch5

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

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

Applying: OSDOCS-17072-batch5
.git/rebase-apply/patch:127: trailing whitespace.
.. Create a YAML file named `fuse-builder-pod.yaml` with the following content: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/modifying-an-existing-ingress-controller.adoc
M	modules/oadp-using-ca-certificates-with-velero-command.adoc
M	modules/ossm-migrating-to-20.adoc
A	modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc deleted in HEAD and modified in OSDOCS-17072-batch5. Version OSDOCS-17072-batch5 of modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc left in tree.
Auto-merging modules/ossm-migrating-to-20.adoc
Auto-merging modules/oadp-using-ca-certificates-with-velero-command.adoc
Auto-merging modules/modifying-an-existing-ingress-controller.adoc
CONFLICT (content): Merge conflict in modules/modifying-an-existing-ingress-controller.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-batch5

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

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

Applying: OSDOCS-17072-batch5
.git/rebase-apply/patch:127: trailing whitespace.
.. Create a YAML file named `fuse-builder-pod.yaml` with the following content: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/modifying-an-existing-ingress-controller.adoc
M	modules/oadp-using-ca-certificates-with-velero-command.adoc
M	modules/ossm-migrating-to-20.adoc
A	modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc deleted in HEAD and modified in OSDOCS-17072-batch5. Version OSDOCS-17072-batch5 of modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc left in tree.
Auto-merging modules/ossm-migrating-to-20.adoc
Auto-merging modules/oadp-using-ca-certificates-with-velero-command.adoc
Auto-merging modules/modifying-an-existing-ingress-controller.adoc
CONFLICT (content): Merge conflict in modules/modifying-an-existing-ingress-controller.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-batch5

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

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

Applying: OSDOCS-17072-batch5
.git/rebase-apply/patch:127: trailing whitespace.
.. Create a YAML file named `fuse-builder-pod.yaml` with the following content: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/modifying-an-existing-ingress-controller.adoc
M	modules/oadp-using-ca-certificates-with-velero-command.adoc
M	modules/ossm-migrating-to-20.adoc
A	modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc deleted in HEAD and modified in OSDOCS-17072-batch5. Version OSDOCS-17072-batch5 of modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc left in tree.
Auto-merging modules/ossm-migrating-to-20.adoc
Auto-merging modules/oadp-using-ca-certificates-with-velero-command.adoc
Auto-merging modules/modifying-an-existing-ingress-controller.adoc
CONFLICT (content): Merge conflict in modules/modifying-an-existing-ingress-controller.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-batch5

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

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

Applying: OSDOCS-17072-batch5
.git/rebase-apply/patch:127: trailing whitespace.
.. Create a YAML file named `fuse-builder-pod.yaml` with the following content: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/modifying-an-existing-ingress-controller.adoc
M	modules/nw-control-dns-records-public-hosted-zone-azure.adoc
M	modules/oadp-using-ca-certificates-with-velero-command.adoc
M	modules/ossm-migrating-to-20.adoc
A	modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc deleted in HEAD and modified in OSDOCS-17072-batch5. Version OSDOCS-17072-batch5 of modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc left in tree.
Auto-merging modules/ossm-migrating-to-20.adoc
Auto-merging modules/oadp-using-ca-certificates-with-velero-command.adoc
Auto-merging modules/nw-control-dns-records-public-hosted-zone-azure.adoc
CONFLICT (content): Merge conflict in modules/nw-control-dns-records-public-hosted-zone-azure.adoc
Auto-merging modules/modifying-an-existing-ingress-controller.adoc
CONFLICT (content): Merge conflict in modules/modifying-an-existing-ingress-controller.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-batch5

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

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

Applying: OSDOCS-17072-batch5
.git/rebase-apply/patch:127: trailing whitespace.
.. Create a YAML file named `fuse-builder-pod.yaml` with the following content: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/modifying-an-existing-ingress-controller.adoc
A	modules/nodes-containers-dev-fuse-configuring.adoc
M	modules/nw-control-dns-records-public-hosted-zone-azure.adoc
M	modules/oadp-using-ca-certificates-with-velero-command.adoc
M	modules/ossm-migrating-to-20.adoc
A	modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc deleted in HEAD and modified in OSDOCS-17072-batch5. Version OSDOCS-17072-batch5 of modules/persistent-storage-csi-azure-file-cross-sub-dynamic-provisioning-procedure.adoc left in tree.
Auto-merging modules/ossm-migrating-to-20.adoc
Auto-merging modules/oadp-using-ca-certificates-with-velero-command.adoc
Auto-merging modules/nw-control-dns-records-public-hosted-zone-azure.adoc
CONFLICT (content): Merge conflict in modules/nw-control-dns-records-public-hosted-zone-azure.adoc
CONFLICT (modify/delete): modules/nodes-containers-dev-fuse-configuring.adoc deleted in HEAD and modified in OSDOCS-17072-batch5. Version OSDOCS-17072-batch5 of modules/nodes-containers-dev-fuse-configuring.adoc left in tree.
Auto-merging modules/modifying-an-existing-ingress-controller.adoc
CONFLICT (content): Merge conflict in modules/modifying-an-existing-ingress-controller.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-batch5

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.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants