Merge pull request #48615 from sbeskin-redhat/OADP_571_Document_ACM_Feature_enhancements-for_Velero

OADP-571 Document ACM feature enhancements for Velero

Author: mburke5678

modules/oadp-creating-backup-cr.adoc

@@ -52,11 +52,27 @@ spec:
   hooks: {}
   includedNamespaces:
   - <namespace> <1>
-  storageLocation: <velero-sample-1> <2>
+  storageLocation: <velero_sample_1> <2>
   ttl: 720h0m0s
+  labelSelector: <3>
+  - matchLabels:
+      app=<label_1>
+  - matchLabels:
+      app=<label_2>
+  - matchLabels:
+      app=<label_3>
+  orlabelSelectors: <4>
+  - matchLabels:
+      app=<label_1>
+  - matchLabels:
+      app=<label_2>
+  - matchLabels:
+      app=<label_3>
 ----
 <1> Specify an array of namespaces to back up.
 <2> Specify the name of the `backupStorageLocations` CR.
+<3> Optional. You can configure the backup to include only the resources with all the labels that you specify in this field. Note that the `labelSelector` and `orlabelSelectors` fields are mutually exclusive. You can use only one of them.
+<4> Optional. You can configure the backup to include the resources with any of the labels that you specify in this field. Note that the `orlabelSelectors` and `labelSelector` fields are mutually exclusive. You can use only one of them.
 
 . Verify that the status of the `Backup` CR is `Completed`:
 +

modules/oadp-creating-restore-cr.adoc

@@ -28,6 +28,7 @@ metadata:
   namespace: openshift-adp
 spec:
   backupName: <backup> <1>
+  existingResourcePolicy: <policy> <2>
   excludedResources:
   - nodes
   - events
@@ -38,6 +39,9 @@ spec:
   restorePVs: true
 ----
 <1> Name of the `Backup` CR.
+<2> Optional. This field accepts two values:
+* `none`: The restore process does not affect existing resources.
+* `update`: The restore process replaces existing resources with their backup versions.
 
 . Verify that the status of the `Restore` CR is `Completed`:
 +