From 9f06359143caa02deebde8d2955da3c12700b5e2 Mon Sep 17 00:00:00 2001 From: "A.Arnold" Date: Mon, 6 Jan 2025 14:25:49 +0000 Subject: [PATCH 1/4] OADP-1986: OADP ROSA needs uninstallation steps Signed-off-by: A.Arnold --- .../installing/oadp-installing-operator.adoc | 2 ++ .../oadp-rosa/oadp-rosa-backing-up-applications.adoc | 4 ++++ snippets/operator-additional-resources.adoc | 0 3 files changed, 6 insertions(+) create mode 100644 snippets/operator-additional-resources.adoc diff --git a/backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc b/backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc index ba6d54403d8e..14f250b92aa5 100644 --- a/backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc +++ b/backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc @@ -23,3 +23,5 @@ The OADP Operator installs link:https://{velero-domain}/docs/v{velero-version}/[ . Click *Operators* -> *Installed Operators* to verify the installation. include::modules/velero-oadp-version-relationship.adoc[leveloffset=+1] + +include::snippets/operator-additional-resources.adoc[] diff --git a/backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc b/backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc index c14470b45362..d90325e413d2 100644 --- a/backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc +++ b/backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc @@ -41,3 +41,7 @@ include::modules/installing-oadp-rosa-sts.adoc[leveloffset=+1] include::modules/performing-a-backup-oadp-rosa-sts.adoc[leveloffset=+2] include::modules/cleanup-a-backup-oadp-rosa-sts.adoc[leveloffset=+2] + +include::snippets/operator-additional-resources.adoc[] + +:oadp-rosa-backing-up-applications!: diff --git a/snippets/operator-additional-resources.adoc b/snippets/operator-additional-resources.adoc new file mode 100644 index 000000000000..e69de29bb2d1 From cb17f6a41e712d097ebdb5c8ff765b3d4dfb6221 Mon Sep 17 00:00:00 2001 From: "A.Arnold" Date: Mon, 6 Jan 2025 15:26:39 +0000 Subject: [PATCH 2/4] update Signed-off-by: A.Arnold --- .../installing/uninstalling-oadp.adoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backup_and_restore/application_backup_and_restore/installing/uninstalling-oadp.adoc b/backup_and_restore/application_backup_and_restore/installing/uninstalling-oadp.adoc index 7cf49e56d54e..077cfcf9c473 100644 --- a/backup_and_restore/application_backup_and_restore/installing/uninstalling-oadp.adoc +++ b/backup_and_restore/application_backup_and_restore/installing/uninstalling-oadp.adoc @@ -7,3 +7,8 @@ include::_attributes/common-attributes.adoc[] toc::[] You uninstall the OpenShift API for Data Protection (OADP) by deleting the OADP Operator. See xref:../../../operators/admin/olm-deleting-operators-from-cluster.adoc#olm-deleting-operators-from-cluster[Deleting Operators from a cluster] for details. + +[role="_additional-resources"] +.Additional resources + +include::snippets/operator-additional-resources.adoc[] From 047de34f605235b29fd4d15425b978e04353bed9 Mon Sep 17 00:00:00 2001 From: "A.Arnold" Date: Mon, 6 Jan 2025 15:34:08 +0000 Subject: [PATCH 3/4] update Signed-off-by: A.Arnold --- .../installing/oadp-installing-operator.adoc | 8 +++++-- snippets/operator-additional-resources.adoc | 24 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc b/backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc index 14f250b92aa5..ed0862644362 100644 --- a/backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc +++ b/backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc @@ -6,9 +6,9 @@ include::_attributes/common-attributes.adoc[] toc::[] -You can install the OpenShift API for Data Protection (OADP) Operator on {product-title} {product-version} by using Operator Lifecycle Manager (OLM). +You can install the {oadp-first} Operator on {product-title} {product-version} by using Operator Lifecycle Manager (OLM). -The OADP Operator installs link:https://{velero-domain}/docs/v{velero-version}/[Velero {velero-version}]. +The {oadp-short} Operator installs link:https://{velero-domain}/docs/v{velero-version}/[Velero {velero-version}]. .Prerequisites @@ -24,4 +24,8 @@ The OADP Operator installs link:https://{velero-domain}/docs/v{velero-version}/[ include::modules/velero-oadp-version-relationship.adoc[leveloffset=+1] +For information about uninstalling {oadp-short}, see xref:../../../backup_and_restore/application_backup_and_restore/installing/uninstalling-oadp.adoc#uninstalling-oadp[Uninstalling the OpenShift API for Data Protection]. + +[role="_additional-resources"] +.Additional resources include::snippets/operator-additional-resources.adoc[] diff --git a/snippets/operator-additional-resources.adoc b/snippets/operator-additional-resources.adoc index e69de29bb2d1..168ed14ecaba 100644 --- a/snippets/operator-additional-resources.adoc +++ b/snippets/operator-additional-resources.adoc @@ -0,0 +1,24 @@ +// Snippets included in the following assemblies and modules: +// +// * /backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc +// * /backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc +// * /backup_and_restore/application_backup_and_restore/installing/uninstalling-oadp.adoc + +:_mod-docs-content-type: SNIPPET + +[role="_additional-resources"] +.Additional resources + +* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-adding-operators-to-a-cluster[Adding Operators to a cluster] +* xref:../../../operators/admin/olm-upgrading-operators.adoc#olm-adding-operators-to-a-cluster[Updating installed Operators] +* xref:../../../operators/admin/olm-deleting-operators-from-cluster.adoc#olm-deleting-operators-from-a-cluster[Deleting Operators from a cluster] +* xref:../../applications/pruning-objects.adoc#pruning-objects[Pruning objects to reclaim resources] +* xref:../../../operators/admin/olm-troubleshooting-operator-issues.adoc#olm-troubleshooting-operator-issues[Troubleshooting Operator issues] +* +// docs not in OCP enterprise so using links + +ifdef::oadp-rosa-backing-up-applications[] +* link:https://docs.openshift.com/rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-deleting-access-cluster.html[Deleting access to a ROSA cluster] +* link:https://docs.openshift.com/rosa/rosa_install_access_delete_clusters/rosa_getting_started_iam/rosa-deleting-cluster.html[Deleting a ROSA cluster] +* link:https://docs.openshift.com/rosa/rosa_backing_up_and_restoring_applications/backing-up-applications.html#cleanup-a-backup-oadp-rosa-sts_rosa-backing-up-applications[Cleaning up a cluster after a backup with OADP and ROSA STS] +endif::[] From f502943e68a9c6ffdd2856e1e8990728ffb6e501 Mon Sep 17 00:00:00 2001 From: "A.Arnold" Date: Mon, 6 Jan 2025 15:59:26 +0000 Subject: [PATCH 4/4] update Signed-off-by: A.Arnold --- snippets/operator-additional-resources.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snippets/operator-additional-resources.adoc b/snippets/operator-additional-resources.adoc index 168ed14ecaba..bd15c1d864e7 100644 --- a/snippets/operator-additional-resources.adoc +++ b/snippets/operator-additional-resources.adoc @@ -12,7 +12,7 @@ * xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-adding-operators-to-a-cluster[Adding Operators to a cluster] * xref:../../../operators/admin/olm-upgrading-operators.adoc#olm-adding-operators-to-a-cluster[Updating installed Operators] * xref:../../../operators/admin/olm-deleting-operators-from-cluster.adoc#olm-deleting-operators-from-a-cluster[Deleting Operators from a cluster] -* xref:../../applications/pruning-objects.adoc#pruning-objects[Pruning objects to reclaim resources] +* xref:../../../applications/pruning-objects.adoc#pruning-objects[Pruning objects to reclaim resources] * xref:../../../operators/admin/olm-troubleshooting-operator-issues.adoc#olm-troubleshooting-operator-issues[Troubleshooting Operator issues] * // docs not in OCP enterprise so using links