Skip to content

Commit 84c2b03

Browse files
authored
Merge pull request #53184 from RichardHoch/vel_vrsion_per_release
OADP-773:Velero version by OADP and OCP version
2 parents d8dfb15 + 20a6631 commit 84c2b03

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

backup_and_restore/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ You can always recover from a disaster situation by xref:../backup_and_restore/c
3434

3535
As a cluster administrator, you can back up and restore applications running on {product-title} by using the OpenShift API for Data Protection (OADP).
3636

37-
OADP backs up and restores Kubernetes resources and internal images, at the granularity of a namespace, by using link:https://{velero-domain}/docs/v{velero-version}/[Velero {velero-version}]. OADP backs up and restores persistent volumes (PVs) by using snapshots or Restic. For details, see xref:../backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc#oadp-features_oadp-features-plugins[OADP features].
37+
OADP backs up and restores Kubernetes resources and internal images, at the granularity of a namespace, by using the version of Velero that is appropriate for the version of OADP you install, according to the table in xref:../backup_and_restore/application_backup_and_restore/troubleshooting.adoc#velero-obtaining-by-downloading_oadp-troubleshooting[Downloading the Velero CLI tool]. OADP backs up and restores persistent volumes (PVs) by using snapshots or Restic. For details, see xref:../backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc#oadp-features_oadp-features-plugins[OADP features].
3838

3939
[id="oadp-requirements"]
4040
=== OADP requirements

modules/velero-obtaining-by-downloading.adoc

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@ The page includes instructions for:
2323

2424
. Open a browser and navigate to link:https://{velero-domain}/docs/v{velero-version}/basic-install/#install-the-cli["Install the CLI" on the Velero website].
2525
. Follow the appropriate procedure for macOS, GitHub, or Windows.
26-
. Download the Velero version appropriate for your version of OADP, according to the table that follows:
26+
. Download the Velero version appropriate for your version of OADP and {product-title} according to the table that follows:
2727
+
28-
.OADP-Velero version relationship
29-
[cols="2", options="header"]
28+
.OADP-Velero-{product-title} version relationship
29+
[cols="3", options="header"]
3030
|===
31-
|OADP version |Velero version
32-
|0.2.6 |1.6.0
33-
|0.5.5 |1.7.1
34-
|1.0.0 |1.7.1
35-
|1.0.1 |1.7.1
36-
|1.0.2 |1.7.1
37-
|1.0.3 |1.7.1
31+
|OADP version |Velero version |{product-title} version
32+
|1.0.0 |link:https://{velero-domain}/docs/v1.7/[1.7] |4.6 and later
33+
|1.0.1 |link:https://{velero-domain}/docs/v1.7/[1.7] |4.6 and later
34+
|1.0.2 |link:https://{velero-domain}/docs/v1.7/[1.7] |4.6 and later
35+
|1.0.3 |link:https://{velero-domain}/docs/v1.7/[1.7] |4.6 and later
36+
|1.1.0 |link:https://{velero-domain}/docs/v{velero-version}/[{velero-version}] |4.9 and later
37+
|1.1.1 |link:https://{velero-domain}/docs/v{velero-version}/[{velero-version}] |4.9 and later
38+
|1.1.2 |link:https://{velero-domain}/docs/v{velero-version}/[{velero-version}] |4.9 and later
3839
|===

0 commit comments

Comments
 (0)