Skip to content

callouts and dita errors for operator installing #105897

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
shdeshpa07 merged 1 commit into from
Feb 10, 2026
Merged

callouts and dita errors for operator installing #105897

shdeshpa07 merged 1 commit into from
Feb 10, 2026
+20 −15

Conversation

@shdeshpa07
Copy link
Contributor

@shdeshpa07 shdeshpa07 commented Feb 4, 2026 •
edited
Loading

Jira

OADP-7031

Fix callouts and dita errors for Installing OADP operator assembly

Version

OCP 4.14 → OCP 4.22

Preview

Installing OADP Operator

@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 4, 2026
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Feb 4, 2026 •
edited
Loading

🤖 Tue Feb 10 05:09:32 - Prow CI generated the docs preview:

https://105897--ocpdocs-pr.netlify.app/openshift-enterprise/latest/backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.html
https://105897--ocpdocs-pr.netlify.app/openshift-enterprise/latest/backup_and_restore/application_backup_and_restore/troubleshooting/velero-cli-tool.html

@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 4, 2026
@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Feb 4, 2026

/retest

@shdeshpa07 shdeshpa07 added the OADP Label for all OADP PRs label Feb 6, 2026
@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Feb 6, 2026

@vashirova and @anarnold97 - Can I please ask for a peer review of the PR ? Thanks.

vashirova
vashirova approved these changes Feb 9, 2026
View reviewed changes
Copy link
Member

@vashirova vashirova left a comment

Choose a reason for hiding this comment

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

@shdeshpa07 peer review completed, LGTM.

@shdeshpa07
callouts and dita errors for operator installing
b53694d 
Signed-off-by: Shruti Deshpande <shdeshpa@redhat.com>
@shdeshpa07 shdeshpa07 force-pushed the oadp-7031-operator-installing branch from bcb5eab to b53694d Compare February 10, 2026 05:02
@openshift-ci
Copy link

openshift-ci bot commented Feb 10, 2026

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

@shdeshpa07 shdeshpa07 added this to the Continuous Release milestone Feb 10, 2026
@shdeshpa07 shdeshpa07 merged commit fa39135 into openshift:main Feb 10, 2026
2 checks passed
@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Feb 10, 2026

/cherrypick enterprise-4.22

@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Feb 10, 2026

/cherrypick enterprise-4.21

@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Feb 10, 2026

/cherrypick enterprise-4.20

@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Feb 10, 2026

/cherrypick enterprise-4.19

@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Feb 10, 2026

/cherrypick enterprise-4.18

@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Feb 10, 2026

/cherrypick enterprise-4.17

@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Feb 10, 2026

/cherrypick enterprise-4.16

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 10, 2026

@shdeshpa07: new pull request created: #106262

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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 10, 2026
Merged
@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Feb 10, 2026

/cherrypick enterprise-4.15

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 10, 2026

@shdeshpa07: new pull request created: #106263

Details

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 openshift-cherrypick-robot mentioned this pull request Feb 10, 2026
Merged
@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Feb 10, 2026

/cherrypick enterprise-4.14

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 10, 2026

@shdeshpa07: new pull request created: #106264

Details

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 openshift-cherrypick-robot mentioned this pull request Feb 10, 2026
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 10, 2026

@shdeshpa07: new pull request created: #106265

Details

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 openshift-cherrypick-robot mentioned this pull request Feb 10, 2026
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 10, 2026

@shdeshpa07: #105897 failed to apply on top of branch "enterprise-4.18":

Applying: callouts and dita errors for operator installing
Using index info to reconstruct a base tree...
M	modules/installing-operator-oadp.adoc
M	modules/velero-oadp-version-relationship.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/velero-oadp-version-relationship.adoc
CONFLICT (content): Merge conflict in modules/velero-oadp-version-relationship.adoc
Auto-merging modules/installing-operator-oadp.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 callouts and dita errors for operator installing
Details

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
Copy link

openshift-cherrypick-robot commented Feb 10, 2026

@shdeshpa07: #105897 failed to apply on top of branch "enterprise-4.17":

Applying: callouts and dita errors for operator installing
Using index info to reconstruct a base tree...
M	modules/installing-operator-oadp.adoc
M	modules/velero-oadp-version-relationship.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/velero-oadp-version-relationship.adoc
CONFLICT (content): Merge conflict in modules/velero-oadp-version-relationship.adoc
Auto-merging modules/installing-operator-oadp.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 callouts and dita errors for operator installing
Details

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
Copy link

openshift-cherrypick-robot commented Feb 10, 2026

@shdeshpa07: #105897 failed to apply on top of branch "enterprise-4.16":

Applying: callouts and dita errors for operator installing
Using index info to reconstruct a base tree...
M	modules/installing-operator-oadp.adoc
M	modules/velero-oadp-version-relationship.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/velero-oadp-version-relationship.adoc
CONFLICT (content): Merge conflict in modules/velero-oadp-version-relationship.adoc
Auto-merging modules/installing-operator-oadp.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 callouts and dita errors for operator installing
Details

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
Copy link

openshift-cherrypick-robot commented Feb 10, 2026

@shdeshpa07: #105897 failed to apply on top of branch "enterprise-4.15":

Applying: callouts and dita errors for operator installing
Using index info to reconstruct a base tree...
M	modules/installing-operator-oadp.adoc
M	modules/velero-oadp-version-relationship.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/velero-oadp-version-relationship.adoc
CONFLICT (content): Merge conflict in modules/velero-oadp-version-relationship.adoc
Auto-merging modules/installing-operator-oadp.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 callouts and dita errors for operator installing
Details

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
Copy link

openshift-cherrypick-robot commented Feb 10, 2026

@shdeshpa07: #105897 failed to apply on top of branch "enterprise-4.14":

Applying: callouts and dita errors for operator installing
Using index info to reconstruct a base tree...
M	modules/installing-operator-oadp.adoc
M	modules/velero-oadp-version-relationship.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/velero-oadp-version-relationship.adoc
CONFLICT (content): Merge conflict in modules/velero-oadp-version-relationship.adoc
Auto-merging modules/installing-operator-oadp.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 callouts and dita errors for operator installing
Details

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.

@shdeshpa07 shdeshpa07 mentioned this pull request Feb 10, 2026
Merged
@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Feb 10, 2026

Other CPs cherry picked off of 4.18 :
4.17: #106267
4.16: #106268
4.15: #106269
4.14: #106270

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

Reviewers

1 more reviewer

@vashirova vashirova vashirova approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

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 branch/enterprise-4.22 OADP Label for all OADP PRs size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

Continuous Release

Development

Successfully merging this pull request may close these issues.

4 participants

@shdeshpa07 @ocpdocs-previewbot @openshift-cherrypick-robot @vashirova