Skip to content

Commit ed0028f

Browse files
authored
Merge pull request #51355 from RichardHoch/oadp_ocp_compat
OADP-717: OADP 1.0.x & OCP 4.11 compatibility issue
2 parents f92592a + 13b397d commit ed0028f

File tree

3 files changed

+17
-0
lines changed

3 files changed

+17
-0
lines changed

backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ To back up PVs with snapshots, you must have a cloud provider that supports eith
3030
* xref:../../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-gcp.adoc#installing-oadp-gcp[Google Cloud Platform]
3131
* CSI snapshot-enabled cloud provider, such as xref:../../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc#installing-oadp-ocs[OpenShift Data Foundation]
3232
33+
include::snippets/oadp-ocp-compat.adoc[]
34+
3335
If your cloud provider does not support snapshots or if your storage is NFS, you can back up applications with xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#oadp-backing-up-applications-restic_backing-up-applications[Restic backups] on object storage.
3436

3537
You create a default `Secret` and then you install the Data Protection Application.

backup_and_restore/index.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ OADP has the following requirements:
5050
** Multicloud Object Gateway
5151
** S3-compatible object storage, such as Noobaa or Minio
5252

53+
include::snippets/oadp-ocp-compat.adoc[]
54+
5355
:FeatureName: The `CloudStorage` API for S3 storage
5456
include::snippets/technology-preview.adoc[]
5557

snippets/oadp-ocp-compat.adoc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
//This snippet appears in the following assemblies:
3+
//
4+
// * .../backup_and_restore/backing_up_and_restoring/installing/about-installing-oadp.adoc
5+
// * .../backup_and_restore/index.adoc
6+
7+
:_content-type: SNIPPET
8+
[NOTE]
9+
====
10+
If you want to use CSI backup on OCP 4.11 and later, install OADP 1.1._x_.
11+
12+
OADP 1.0._x_ does not support CSI backup on OCP 4.11 and later. OADP 1.0._x_ includes Velero 1.7._x_ and expects the API group `snapshot.storage.k8s.io/v1beta1`, which is not present on OCP 4.11 and later.
13+
====

0 commit comments

Comments
 (0)