Skip to content

Commit 1930e14

Browse files
committed
OSDOCS-12690: Add OADP to ROSA docs
1 parent ea208d5 commit 1930e14

21 files changed

+267
-88
lines changed

_topic_maps/_topic_map_rosa.yml

Lines changed: 92 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,12 +1244,100 @@ Topics:
12441244
# - Name: Using the internal registry
12451245
# File: rosa-using-internal-registry
12461246
---
1247-
Name: Backing up and restoring applications
1248-
Dir: rosa_backing_up_and_restoring_applications
1247+
Name: Backup and restore
1248+
Dir: backup_and_restore
12491249
Distros: openshift-rosa
12501250
Topics:
1251-
- Name: Backing up applications
1252-
File: backing-up-applications
1251+
- Name: OADP Application backup and restore
1252+
Dir: application_backup_and_restore
1253+
Topics:
1254+
- Name: Introduction to OpenShift API for Data Protection
1255+
File: oadp-intro
1256+
- Name: OADP release notes
1257+
Dir: release-notes
1258+
Topics:
1259+
- Name: OADP 1.4 release notes
1260+
File: oadp-1-4-release-notes
1261+
- Name: OADP performance
1262+
Dir: oadp-performance
1263+
Topics:
1264+
- Name: OADP recommended network settings
1265+
File: oadp-recommended-network-settings
1266+
- Name: OADP features and plugins
1267+
File: oadp-features-plugins
1268+
- Name: OADP use cases
1269+
Dir: oadp-use-cases
1270+
Topics:
1271+
- Name: Backing up an application using OADP with ROSA STS
1272+
File: oadp-rosa-backup-restore
1273+
# ODF not supported on ROSA Classic
1274+
# - Name: Backing up an application using OADP and ODF
1275+
# File: oadp-usecase-backup-using-odf
1276+
- Name: Restoring a backup to a different namespace
1277+
File: oadp-usecase-restore-different-namespace
1278+
# ODF not supported on ROSA Classic
1279+
# - Name: Including a self-signed CA certificate during backup
1280+
# File: oadp-usecase-enable-ca-cert
1281+
- Name: Installing and configuring OADP
1282+
Dir: oadp-rosa
1283+
Topics:
1284+
- Name: Installing OADP
1285+
File: oadp-rosa-backing-up-applications
1286+
- Name: Uninstalling OADP
1287+
Dir: installing
1288+
Topics:
1289+
- Name: Uninstalling OADP
1290+
File: uninstalling-oadp
1291+
- Name: OADP backing up
1292+
Dir: backing_up_and_restoring
1293+
Topics:
1294+
- Name: Backing up applications
1295+
File: backing-up-applications
1296+
- Name: Creating a Backup CR
1297+
File: oadp-creating-backup-cr
1298+
# ROSA docs do not include CSI snapshots
1299+
# - Name: Backing up persistent volumes with CSI snapshots
1300+
# File: oadp-backing-up-pvs-csi-doc
1301+
# - Name: Backing up applications with File System Backup
1302+
# File: oadp-backing-up-applications-restic-doc
1303+
- Name: Creating backup hooks
1304+
File: oadp-creating-backup-hooks-doc
1305+
- Name: Scheduling backups using Schedule CR
1306+
File: oadp-scheduling-backups-doc
1307+
- Name: Deleting backups
1308+
File: oadp-deleting-backups
1309+
# - Name: About Kopia
1310+
# File: oadp-about-kopia
1311+
- Name: OADP restoring
1312+
Dir: backing_up_and_restoring
1313+
Topics:
1314+
- Name: Restoring applications
1315+
File: restoring-applications
1316+
# - Name: OADP and ROSA
1317+
# Dir: oadp-rosa
1318+
# Topics:
1319+
# - Name: Backing up applications on ROSA STS using OADP
1320+
# File: oadp-rosa-backing-up-applications
1321+
# - Name: OADP and AWS STS
1322+
# Dir: aws-sts
1323+
# Topics:
1324+
# - Name: Backing up applications on AWS STS using OADP
1325+
# File: oadp-aws-sts
1326+
# - Name: OADP Data Mover
1327+
# Dir: installing
1328+
# Topics:
1329+
# - Name: About the OADP Data Mover
1330+
# File: about-oadp-data-mover
1331+
# - Name: Backing up and restoring volumes by using CSI snapshots data movement
1332+
# File: oadp-backup-restore-csi-snapshots
1333+
# - Name: Overriding Kopia algorithms
1334+
# File: overriding-kopia-algorithms
1335+
# - Name: Troubleshooting
1336+
# File: troubleshooting
1337+
# - Name: OADP API
1338+
# File: oadp-api
1339+
# - Name: Advanced OADP features and functionalities
1340+
# File: oadp-advanced-topics
12531341
---
12541342
Name: Nodes
12551343
Dir: nodes

_topic_maps/_topic_map_rosa_hcp.yml

Lines changed: 94 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -383,13 +383,6 @@ Topics:
383383
File: generic-ephemeral-vols
384384
- Name: Dynamic provisioning
385385
File: dynamic-provisioning
386-
# ---
387-
# Name: Backing up and restoring applications
388-
# Dir: rosa_backing_up_and_restoring_applications
389-
# Distros: openshift-rosa-hcp
390-
# Topics:
391-
# - Name: Backing up applications
392-
# File: backing-up-applications
393386
---
394387
Name: Registry
395388
Dir: registry
@@ -402,6 +395,100 @@ Topics:
402395
- Name: Accessing the registry
403396
File: accessing-the-registry
404397
---
398+
Name: Backup and restore
399+
Dir: backup_and_restore
400+
Distros: openshift-rosa-hcp
401+
Topics:
402+
- Name: OADP Application backup and restore
403+
Dir: application_backup_and_restore
404+
Topics:
405+
- Name: Introduction to OpenShift API for Data Protection
406+
File: oadp-intro
407+
- Name: OADP release notes
408+
Dir: release-notes
409+
Topics:
410+
- Name: OADP 1.4 release notes
411+
File: oadp-1-4-release-notes
412+
- Name: OADP performance
413+
Dir: oadp-performance
414+
Topics:
415+
- Name: OADP recommended network settings
416+
File: oadp-recommended-network-settings
417+
- Name: OADP features and plugins
418+
File: oadp-features-plugins
419+
- Name: OADP use cases
420+
Dir: oadp-use-cases
421+
Topics:
422+
- Name: Backing up an application using OADP with ROSA STS
423+
File: oadp-rosa-backup-restore
424+
- Name: Backing up an application using OADP and ODF
425+
File: oadp-usecase-backup-using-odf
426+
- Name: Restoring a backup to a different namespace
427+
File: oadp-usecase-restore-different-namespace
428+
- Name: Including a self-signed CA certificate during backup
429+
File: oadp-usecase-enable-ca-cert
430+
- Name: Installing and configuring OADP
431+
Dir: oadp-rosa
432+
Topics:
433+
- Name: Installing OADP
434+
File: oadp-rosa-backing-up-applications
435+
# TODO: Include this when the Operators book is added to ROSA HCP
436+
# - Name: Uninstalling OADP
437+
# Dir: installing
438+
# Topics:
439+
# - Name: Uninstalling OADP
440+
# File: uninstalling-oadp
441+
- Name: OADP backing up
442+
Dir: backing_up_and_restoring
443+
Topics:
444+
- Name: Backing up applications
445+
File: backing-up-applications
446+
- Name: Creating a Backup CR
447+
File: oadp-creating-backup-cr
448+
# ROSA docs do not include CSI snapshots
449+
# - Name: Backing up persistent volumes with CSI snapshots
450+
# File: oadp-backing-up-pvs-csi-doc
451+
# - Name: Backing up applications with File System Backup
452+
# File: oadp-backing-up-applications-restic-doc
453+
- Name: Creating backup hooks
454+
File: oadp-creating-backup-hooks-doc
455+
- Name: Scheduling backups using Schedule CR
456+
File: oadp-scheduling-backups-doc
457+
- Name: Deleting backups
458+
File: oadp-deleting-backups
459+
# - Name: About Kopia
460+
# File: oadp-about-kopia
461+
- Name: OADP restoring
462+
Dir: backing_up_and_restoring
463+
Topics:
464+
- Name: Restoring applications
465+
File: restoring-applications
466+
# - Name: OADP and ROSA
467+
# Dir: oadp-rosa
468+
# Topics:
469+
# - Name: Backing up applications on ROSA STS using OADP
470+
# File: oadp-rosa-backing-up-applications
471+
# - Name: OADP and AWS STS
472+
# Dir: aws-sts
473+
# Topics:
474+
# - Name: Backing up applications on AWS STS using OADP
475+
# File: oadp-aws-sts
476+
# - Name: OADP Data Mover
477+
# Dir: installing
478+
# Topics:
479+
# - Name: About the OADP Data Mover
480+
# File: about-oadp-data-mover
481+
# - Name: Backing up and restoring volumes by using CSI snapshots data movement
482+
# File: oadp-backup-restore-csi-snapshots
483+
# - Name: Overriding Kopia algorithms
484+
# File: overriding-kopia-algorithms
485+
# - Name: Troubleshooting
486+
# File: troubleshooting
487+
# - Name: OADP API
488+
# File: oadp-api
489+
# - Name: Advanced OADP features and functionalities
490+
# File: oadp-advanced-topics
491+
---
405492
Name: Nodes
406493
Dir: nodes
407494
Distros: openshift-rosa-hcp

backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ Because all taken backup remains until expired, also check the time to live (TTL
1313

1414
You can back up applications by creating a `Backup` custom resource (CR). For more information, see xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-creating-backup-cr.adoc#oadp-creating-backup-cr-doc[Creating a Backup CR].
1515

16+
ifdef::openshift-rosa,openshift-rosa-hcp[]
17+
The `Backup` CR creates backup files for Kubernetes resources and internal images on S3 object storage.
18+
endif::openshift-rosa,openshift-rosa-hcp[]
19+
20+
ifndef::openshift-rosa,openshift-rosa-hcp[]
1621
* The `Backup` CR creates backup files for Kubernetes resources and internal images on S3 object storage.
1722
* If your cloud provider has a native snapshot API or supports CSI snapshots, the `Backup` CR backs up persistent volumes (PVs) by creating snapshots. For more information about working with CSI snapshots, see xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-backing-up-pvs-csi-doc.adoc#oadp-backing-up-pvs-csi-doc[Backing up persistent volumes with CSI snapshots].
1823

@@ -36,6 +41,7 @@ include::snippets/pod-volume-restore-snapshot-read-only.adoc[]
3641
====
3742
The {oadp-first} does not support backing up volume snapshots that were created by other software.
3843
====
44+
endif::openshift-rosa,openshift-rosa-hcp[]
3945

4046
include::modules/oadp-review-backup-restore.adoc[leveloffset=+1]
4147

@@ -50,16 +56,21 @@ You can schedule backups by creating a `Schedule` CR instead of a `Backup` CR. S
5056
[id="known-issues-backing-up-applications"]
5157
== Known issues
5258

53-
{ocp} {product-version} enforces a pod security admission (PSA) policy that can hinder the readiness of pods during a Restic restore process. 
59+
{product-title} {product-version} enforces a pod security admission (PSA) policy that can hinder the readiness of pods during a Restic restore process.
5460

5561
This issue has been resolved in the OADP 1.1.6 and OADP 1.2.2 releases, therefore it is recommended that users upgrade to these releases.
5662

63+
ifndef::openshift-rosa,openshift-rosa-hcp[]
5764
For more information, see xref:../../../backup_and_restore/application_backup_and_restore/troubleshooting.adoc#oadp-restic-restore-failing-psa-policy_oadp-troubleshooting[Restic restore partially failing on OCP 4.15 due to changed PSA policy].
65+
endif::openshift-rosa,openshift-rosa-hcp[]
5866

67+
// TODO: Add xrefs to ROSA HCP when Operators book is added.
68+
ifndef::openshift-rosa-hcp[]
5969
[role="_additional-resources"]
6070
.Additional resources
6171
* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operators-from-operatorhub_olm-adding-operators-to-a-cluster[Installing Operators on clusters for administrators]
72+
// This xref is not included in the ROSA docs.
73+
ifndef::openshift-rosa[]
6274
* xref:../../../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-operators-in-namespace[Installing Operators in namespaces for non-administrators]
63-
64-
65-
75+
endif::openshift-rosa[]
76+
endif::openshift-rosa-hcp[]

backup_and_restore/application_backup_and_restore/backing_up_and_restoring/restoring-applications.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ include::modules/oadp-creating-restore-hooks.adoc[leveloffset=+1]
1818
include::snippets/oadp-image-stream-tag-trigger.adoc[leveloffset=+1]
1919
====
2020

21+
//TODO: Add this xref to ROSA HCP when Images book is added.
22+
ifndef::openshift-rosa-hcp[]
2123
[role="_additional-resources"]
2224
.Additional resources
2325
2426
* xref:../../../openshift_images/triggering-updates-on-imagestream-changes.adoc#triggering-updates-on-imagestream-changes[Triggering updates on image stream changes]
25-
26-
27+
endif::openshift-rosa-hcp[]

backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ include::modules/oadp-features.adoc[leveloffset=+1]
1414
include::modules/oadp-plugins.adoc[leveloffset=+1]
1515
include::modules/oadp-configuring-velero-plugins.adoc[leveloffset=+1]
1616
include::modules/oadp-plugins-receiving-eof-message.adoc[leveloffset=+2]
17+
ifndef::openshift-rosa,openshift-rosa-hcp[]
1718
include::modules/oadp-supported-architecture.adoc[leveloffset=+1]
19+
endif::openshift-rosa,openshift-rosa-hcp[]
1820

21+
ifndef::openshift-rosa,openshift-rosa-hcp[]
1922
[id="oadp-support-for-ibm-power-and-ibm-z"]
2023
== OADP support for {ibm-power-title} and {ibm-z-title}
2124

@@ -30,6 +33,7 @@ OpenShift API for Data Protection (OADP) is platform neutral. The information th
3033
include::modules/oadp-ibm-power-test-support.adoc[leveloffset=+2]
3134
include::modules/oadp-ibm-z-test-support.adoc[leveloffset=+2]
3235
include::modules/oadp-ibm-power-and-z-known-issues.adoc[leveloffset=+3]
36+
endif::openshift-rosa,openshift-rosa-hcp[]
3337

3438
include::modules/oadp-fips.adoc[leveloffset=+1]
3539

backup_and_restore/application_backup_and_restore/oadp-intro.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ toc::[]
1111

1212
The {oadp-first} product safeguards customer applications on {product-title}. It offers comprehensive disaster recovery protection, covering {product-title} applications, application-related cluster resources, persistent volumes, and internal images. {oadp-short} is also capable of backing up both containerized applications and virtual machines (VMs).
1313

14+
ifndef::openshift-rosa,openshift-rosa-hcp[]
1415
However, {oadp-short} does not serve as a disaster recovery solution for xref:../../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backup-etcd[etcd] or {OCP-short} Operators.
16+
endif::openshift-rosa,openshift-rosa-hcp[]
1517

1618
{oadp-short} support is provided to customer workload namespaces, and cluster scope resources.
1719

@@ -27,13 +29,17 @@ OADP provides the following APIs:
2729
* xref:../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#backing-up-applications[Backup]
2830
* xref:../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/restoring-applications.adoc#restoring-applications[Restore]
2931
* xref:../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-scheduling-backups-doc.adoc#oadp-scheduling-backups-doc[Schedule]
32+
ifndef::openshift-rosa,openshift-rosa-hcp[]
3033
* xref:../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-aws.adoc#oadp-about-backup-snapshot-locations_installing-oadp-aws[BackupStorageLocation]
3134
* xref:../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-backing-up-pvs-csi-doc.adoc#oadp-backing-up-pvs-csi-doc[VolumeSnapshotLocation]
35+
endif::openshift-rosa,openshift-rosa-hcp[]
3236

3337
include::modules/oadp-operator-supported.adoc[leveloffset=+2]
3438

39+
ifndef::openshift-rosa,openshift-rosa-hcp[]
3540
[role="_additional-resources"]
3641
.Additional resources
3742

3843
* xref:../../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backup-etcd[Backing up etcd]
3944
// once finished re-work come back and add doc links to the APIs
45+
endif::openshift-rosa,openshift-rosa-hcp[]

backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="oadp-rosa-backing-up-applications"]
3+
ifndef::openshift-rosa,openshift-rosa-hcp[]
34
= Backing up applications on ROSA clusters using OADP
5+
endif::openshift-rosa,openshift-rosa-hcp[]
6+
ifdef::openshift-rosa,openshift-rosa-hcp[]
7+
= Installing OADP
8+
endif::openshift-rosa,openshift-rosa-hcp[]
49
include::_attributes/common-attributes.adoc[]
510
:context: oadp-rosa-backing-up-applications
611

712
toc::[]
813

914
You can use {oadp-first} with {product-rosa} (ROSA) clusters to back up and restore application data.
1015

16+
ifndef::openshift-rosa,openshift-rosa-hcp[]
1117
ROSA is a fully-managed, turnkey application platform that allows you to deliver value to your customers by building and deploying applications.
1218

1319
ROSA provides seamless integration with a wide range of {aws-first} compute, database, analytics, machine learning, networking, mobile, and other services to speed up the building and delivery of differentiating experiences to your customers.
@@ -17,6 +23,7 @@ You can subscribe to the service directly from your {aws-short} account.
1723
After you create your clusters, you can operate your clusters with the {product-title} web console or through link:https://docs.openshift.com/dedicated/ocm/ocm-overview.html[{cluster-manager-first}]. You can also use ROSA with OpenShift APIs and command-line interface (CLI) tools.
1824

1925
For additional information about ROSA installation, see link:https://www.redhat.com/en/products/interactive-walkthrough/install-rosa[Installing Red Hat OpenShift Service on AWS (ROSA) interactive walkthrough].
26+
endif::openshift-rosa,openshift-rosa-hcp[]
2027

2128
Before installing {oadp-first}, you must set up role and policy credentials for OADP so that it can use the {aws-full} API.
2229

@@ -31,13 +38,18 @@ include::modules/installing-oadp-rosa-sts.adoc[leveloffset=+1]
3138

3239
[role="_additional-resources"]
3340
.Additional resources
34-
41+
// This xref points to a topic that is not published in the ROSA docs.
42+
ifndef::openshift-rosa,openshift-rosa-hcp[]
3543
* xref:../../../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-from-operatorhub-using-web-console_olm-installing-operators-in-namespace[Installing from OperatorHub using the web console].
44+
endif::openshift-rosa,openshift-rosa-hcp[]
3645
* xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#backing-up-applications[Backing up applications]
3746

47+
// For ROSA and ROSA HCP, this section is in oadp-use-cases/oadp-rosa-backup-restore.adoc
48+
ifndef::openshift-rosa,openshift-rosa-hcp[]
3849
[id="oadp-rosa-backing-up-and-cleaning"]
3950
== Example: Backing up workload on OADP ROSA STS, with an optional cleanup
4051

4152
include::modules/performing-a-backup-oadp-rosa-sts.adoc[leveloffset=+2]
4253

4354
include::modules/cleanup-a-backup-oadp-rosa-sts.adoc[leveloffset=+2]
55+
endif::openshift-rosa,openshift-rosa-hcp[]
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="oadp-rosa-backing-up-and-cleaning-example"]
3+
= Backing up workloads on OADP with ROSA STS
4+
include::_attributes/common-attributes.adoc[]
5+
:context: oadp-rosa-backing-up-and-cleaning-example
6+
7+
toc::[]
8+
9+
include::modules/performing-a-backup-oadp-rosa-sts.adoc[leveloffset=+1]
10+
11+
include::modules/cleanup-a-backup-oadp-rosa-sts.adoc[leveloffset=+1]

backup_and_restore/application_backup_and_restore/release-notes/oadp-1-4-release-notes.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@ include::modules/oadp-1-4-0-release-notes.adoc[leveloffset=+1]
1919
include::modules/oadp-backing-up-dpa-configuration-1-4-0.adoc[leveloffset=+3]
2020
include::modules/oadp-upgrading-oadp-operator-1-4-0.adoc[leveloffset=+3]
2121

22+
// TODO: Include this xref when the Operators book is added to the ROSA HCP docs.
23+
ifndef::openshift-rosa-hcp[]
2224
[role="_additional-resources"]
2325
.Additional resources
2426
* xref:../../../operators/admin/olm-upgrading-operators.adoc#olm-changing-update-channel_olm-upgrading-operators[Updating installed Operators]
27+
endif::openshift-rosa-hcp[]
2528
2629
[id="oadp-converting-dpa-to-new-version-1-4-0_{context}"]
2730
=== Converting DPA to the new version

0 commit comments

Comments
 (0)