Skip to content

Move OADP configuring sections one level up #93898

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
merged 1 commit into from
Jun 5, 2025
Merged

Move OADP configuring sections one level up #93898

merged 1 commit into from
Jun 5, 2025

Conversation

shdeshpa07
Copy link
Contributor

@shdeshpa07 shdeshpa07 commented May 29, 2025 •
edited
Loading

Jira

Moving the OADP Configuring.. sections for all cloud providers including Virt, one level up. This is done beause these sections are no longer visible in the right-side 'Jump to section' TOC. Engg has asked to make it visible in the 'Jump to section'.

Version

  • OCP 4.13 → OCP 4.19

Preview

Configuring OADP with Virt

QE Review

  • QE has approved this change.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 29, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented May 29, 2025 •
edited
Loading

🤖 Wed Jun 04 14:51:46 - Prow CI generated the docs preview:
https://93898--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@shdeshpa07
Copy link
Contributor Author

/label OADP

@openshift-ci openshift-ci bot added the OADP Label for all OADP PRs label May 29, 2025
@shdeshpa07
Copy link
Contributor Author

@anarnold97 - Would you please give this PR a quick review? Thanks.

anarnold97
anarnold97 approved these changes May 29, 2025
View reviewed changes
Copy link
Contributor

@anarnold97 anarnold97 left a comment

Choose a reason for hiding this comment

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

LGTM

@shdeshpa07
Copy link
Contributor Author

@weshayutin - Could you please review this PR? We have moved Virt section and the other cloud provider sections one level up. This leads to a bit of scrolling in the Jump to section. But, can't help it. No one seems to be happy with the new docs website. Thanks.

@weshayutin
Copy link

heh.. and the preview is NOT rendered with the new production layout ¯_(ツ)_/¯

@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented May 30, 2025 •
edited
Loading

/remove-label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label May 30, 2025
@shdeshpa07
Copy link
Contributor Author

heh.. and the preview is NOT rendered with the new production layout ¯_(ツ)_/¯

yes, the irony.

@bscott-rh bscott-rh added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels May 30, 2025
bscott-rh
bscott-rh reviewed May 30, 2025
View reviewed changes
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 2, 2025
@shdeshpa07 shdeshpa07 force-pushed the OADP-6202-installing-section branch 3 times, most recently from c5e20ec to 9d5c116 Compare June 4, 2025 07:43
@shdeshpa07
Copy link
Contributor Author

shdeshpa07 commented Jun 4, 2025 •
edited
Loading

/remove-label peer-review-in-progress

@xenolinux xenolinux removed the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Jun 4, 2025
@shdeshpa07
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Jun 4, 2025
@shdeshpa07
Copy link
Contributor Author

/remove-label peer-review-needed

@openshift-ci openshift-ci bot removed the peer-review-needed Signifies that the peer review team needs to review this PR label Jun 4, 2025
@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Jun 5, 2025
@xenolinux xenolinux 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 Jun 5, 2025
xenolinux
xenolinux reviewed Jun 5, 2025
View reviewed changes
Copy link
Contributor

@xenolinux xenolinux left a comment

Choose a reason for hiding this comment

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

LGTM, merging

@xenolinux xenolinux merged commit b2f6dce into openshift:main Jun 5, 2025
2 checks passed
@xenolinux xenolinux removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Jun 5, 2025
@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.13

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.14

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.15

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.16

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.17

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.18

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.19

@openshift-cherrypick-robot
Copy link

@xenolinux: #93898 failed to apply on top of branch "enterprise-4.13":

Applying: OADP-6202 move one level up
error: mode change for backup_and_restore/application_backup_and_restore/backup-and-restore-cr-issues.adoc, which is not in current HEAD
error: could not build fake ancestor
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 OADP-6202 move one level up

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

@xenolinux: #93898 failed to apply on top of branch "enterprise-4.14":

Applying: OADP-6202 move one level up
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc
M	backup_and_restore/application_backup_and_restore/troubleshooting.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): backup_and_restore/application_backup_and_restore/troubleshooting.adoc deleted in OADP-6202 move one level up and modified in HEAD. Version HEAD of backup_and_restore/application_backup_and_restore/troubleshooting.adoc left in tree.
Auto-merging backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
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 OADP-6202 move one level up

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

@xenolinux: #93898 failed to apply on top of branch "enterprise-4.15":

Applying: OADP-6202 move one level up
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc
Falling back to patching base and 3-way merge...
Removing backup_and_restore/application_backup_and_restore/troubleshooting.adoc
Auto-merging backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
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 OADP-6202 move one level up

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

@xenolinux: #93898 failed to apply on top of branch "enterprise-4.16":

Applying: OADP-6202 move one level up
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc
Falling back to patching base and 3-way merge...
Removing backup_and_restore/application_backup_and_restore/troubleshooting.adoc
Auto-merging backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
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 OADP-6202 move one level up

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

@xenolinux: #93898 failed to apply on top of branch "enterprise-4.17":

Applying: OADP-6202 move one level up
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
Removing backup_and_restore/application_backup_and_restore/troubleshooting.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
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 OADP-6202 move one level up

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

@xenolinux: new pull request created: #94306

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 openshift-cherrypick-robot mentioned this pull request Jun 5, 2025
Merged
@openshift-cherrypick-robot
Copy link

@xenolinux: new pull request created: #94307

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 Jun 5, 2025
Merged
@xenolinux
Copy link
Contributor

uh oh, automated cherry picks failed for 4.13 - 4.17. :( We need manual CPs

@shdeshpa07
Copy link
Contributor Author

uh oh, automated cherry picks failed for 4.13 - 4.17. :( We need manual CPs

Sorry about that Servesha. I'll create manual CPs for those versions and link here. Thanks.

This was referenced Jun 5, 2025
Merged
Closed
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xenolinux xenolinux xenolinux left review comments

@bscott-rh bscott-rh bscott-rh left review comments

@anarnold97 anarnold97 anarnold97 approved these changes

@ShaunaDiaz ShaunaDiaz ShaunaDiaz left review comments

@weshayutin weshayutin weshayutin approved these changes

Assignees

@ShaunaDiaz ShaunaDiaz

Labels
branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 lgtm Indicates that a PR is ready to be merged. OADP Label for all OADP PRs peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.
8 participants
@shdeshpa07 @ocpdocs-previewbot @weshayutin @ShaunaDiaz @xenolinux @openshift-cherrypick-robot @bscott-rh @anarnold97