diff --git a/_attributes/common-attributes.adoc b/_attributes/common-attributes.adoc index ba9b387a0c..c862a88441 100644 --- a/_attributes/common-attributes.adoc +++ b/_attributes/common-attributes.adoc @@ -44,9 +44,9 @@ endif::[] :oadp-first: OpenShift API for Data Protection (OADP) :oadp-full: OpenShift API for Data Protection :oadp-short: OADP -:oadp-version: 1.4.2 -:oadp-version-1-3: 1.3.3 -:oadp-version-1-4: 1.4.2 +:oadp-version: 1.4.3 +:oadp-version-1-3: 1.3.5 +:oadp-version-1-4: 1.4.3 :oadp-bsl-api: backupstoragelocations.velero.io :oc-first: pass:quotes[OpenShift CLI (`oc`)] :product-registry: OpenShift image registry @@ -365,4 +365,4 @@ endif::openshift-origin[] :hcp-capital: Hosted control planes :hcp: hosted control planes :mce: multicluster engine for Kubernetes Operator -:mce-short: multicluster engine Operator \ No newline at end of file +:mce-short: multicluster engine Operator diff --git a/backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc b/backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc index 79cd47ad66..bfd7b1c4cb 100644 --- a/backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc +++ b/backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc @@ -24,10 +24,8 @@ ifndef::openshift-rosa,openshift-rosa-hcp[] OpenShift API for Data Protection (OADP) is platform neutral. The information that follows relates only to {ibm-power-name} and to {ibm-z-name}. -* {oadp-short} 1.1.7 was tested successfully against {product-title} 4.11 for both {ibm-power-name} and {ibm-z-name}. The sections that follow give testing and support information for {oadp-short} 1.1.7 in terms of backup locations for these systems. -* {oadp-short} 1.2.3 was tested successfully against {product-title} 4.12, 4.13, 4.14, and 4.15 for both {ibm-power-name} and {ibm-z-name}. The sections that follow give testing and support information for {oadp-short} 1.2.3 in terms of backup locations for these systems. * {oadp-short} {oadp-version-1-3} was tested successfully against {product-title} 4.12, 4.13, 4.14, and 4.15 for both {ibm-power-name} and {ibm-z-name}. The sections that follow give testing and support information for {oadp-short} {oadp-version-1-3} in terms of backup locations for these systems. -* {oadp-short} {oadp-version-1-4} was tested successfully against {product-title} 4.14, 4.15, and 4.16 for both {ibm-power-name} and {ibm-z-name}. The sections that follow give testing and support information for {oadp-short} {oadp-version-1-4} in terms of backup locations for these systems. +* {oadp-short} {oadp-version-1-4} was tested successfully against {product-title} 4.14, 4.15, 4.16, and 4.17 for both {ibm-power-name} and {ibm-z-name}. The sections that follow give testing and support information for {oadp-short} {oadp-version-1-4} in terms of backup locations for these systems. include::modules/oadp-ibm-power-test-support.adoc[leveloffset=+2] diff --git a/modules/oadp-ibm-power-test-support.adoc b/modules/oadp-ibm-power-test-support.adoc index f7197f8bfa..319b26f084 100644 --- a/modules/oadp-ibm-power-test-support.adoc +++ b/modules/oadp-ibm-power-test-support.adoc @@ -6,7 +6,5 @@ [id="oadp-ibm-power-test-matrix_{context}"] = OADP support for target backup locations using {ibm-power-title} -* {ibm-power-name} running with {product-title} 4.11 and 4.12, and {oadp-first} 1.1.7 was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibm-power-name} with {product-title} 4.11 and 4.12, and {oadp-short} 1.1.7 against all S3 backup location targets, which are not AWS, as well. -* {ibm-power-name} running with {product-title} 4.12, 4.13, 4.14, and 4.15, and {oadp-short} 1.2.3 was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibm-power-name} with {product-title} 4.12, 4.13. 4.14, and 4.15, and {oadp-short} 1.2.3 against all S3 backup location targets, which are not AWS, as well. * {ibm-power-name} running with {product-title} 4.12, 4.13, 4.14, and 4.15, and {oadp-short} {oadp-version-1-3} was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibm-power-name} with {product-title} 4.13, 4.14, and 4.15, and {oadp-short} {oadp-version-1-3} against all S3 backup location targets, which are not AWS, as well. -* {ibm-power-name} running with {product-title} 4.14, 4.15, and 4.16, and {oadp-short} {oadp-version-1-4} was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibm-power-name} with {product-title} 4.14, 4.15, and 4.16, and {oadp-short} {oadp-version-1-4} against all S3 backup location targets, which are not AWS, as well. +* {ibm-power-name} running with {product-title} 4.14, 4.15, 4.16, and 4.17, and {oadp-short} {oadp-version-1-4} was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibm-power-name} with {product-title} 4.14, 4.15, 4.16, and 4.17, and {oadp-short} {oadp-version-1-4} against all S3 backup location targets, which are not AWS, as well. diff --git a/modules/oadp-ibm-z-test-support.adoc b/modules/oadp-ibm-z-test-support.adoc index 1ab726c392..9fa240baca 100644 --- a/modules/oadp-ibm-z-test-support.adoc +++ b/modules/oadp-ibm-z-test-support.adoc @@ -6,7 +6,5 @@ [id="oadp-ibm-z-test-support_{context}"] = OADP testing and support for target backup locations using {ibm-z-title} -* {ibm-z-name} running with {product-title} 4.11 and 4.12, and {oadp-first} 1.1.7 was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibm-z-name} with {product-title} 4.11 and 4.12, and {oadp-short} 1.1.7 against all S3 backup location targets, which are not AWS, as well. -* {ibm-z-name} running with {product-title} 4.12, 4.13, 4.14, and 4.15, and {oadp-short} 1.2.3 was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibm-z-name} with {product-title} 4.12, 4.13, 4.14 and 4.15, and {oadp-short} 1.2.3 against all S3 backup location targets, which are not AWS, as well. * {ibm-z-name} running with {product-title} 4.12, 4.13, 4.14, and 4.15, and {oadp-version-1-3} was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibm-z-name} with {product-title} 4.13 4.14, and 4.15, and {oadp-version-1-3} against all S3 backup location targets, which are not AWS, as well. -* {ibm-z-name} running with {product-title} 4.14, 4.15, and 4.16, and {oadp-version-1-4} was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibm-z-name} with {product-title} 4.14, 4.15, and 4.16, and {oadp-version-1-4} against all S3 backup location targets, which are not AWS, as well. +* {ibm-z-name} running with {product-title} 4.14, 4.15, 4.16, and 4.17, and {oadp-version-1-4} was tested successfully against an AWS S3 backup location target. Although the test involved only an AWS S3 target, Red Hat supports running {ibm-z-name} with {product-title} 4.14, 4.15, 4.16, and 4.17, and {oadp-version-1-4} against all S3 backup location targets, which are not AWS, as well. diff --git a/modules/velero-oadp-version-relationship.adoc b/modules/velero-oadp-version-relationship.adoc index f4d65ceffa..46c1cd0e3d 100644 --- a/modules/velero-oadp-version-relationship.adoc +++ b/modules/velero-oadp-version-relationship.adoc @@ -1,3 +1,9 @@ +// Module included in the following assemblies: +// +// backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc +// backup_and_restore/application_backup_and_restore/troubleshooting.adoc +// + :_mod-docs-content-type: CONCEPT [id="velero-oadp-version-relationship_{context}"] = OADP-Velero-{product-title} version relationship @@ -5,22 +11,14 @@ [cols="3", options="header"] |=== |OADP version |Velero version |{product-title} version -| 1.1.0 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.9 and later -| 1.1.1 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.9 and later -| 1.1.2 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.9 and later -| 1.1.3 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.9 and later -| 1.1.4 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.9 and later -| 1.1.5 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.9 and later -| 1.1.6 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.11 and later -| 1.1.7 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.11 and later -| 1.2.0 | link:https://{velero-domain}/docs/v1.11/[1.11] | 4.11 and later -| 1.2.1 | link:https://{velero-domain}/docs/v1.11/[1.11] | 4.11 and later -| 1.2.2 | link:https://{velero-domain}/docs/v1.11/[1.11] | 4.11 and later -| 1.2.3 | link:https://{velero-domain}/docs/v1.11/[1.11] | 4.11 and later -| 1.3.0 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.10-4.15 -| 1.3.1 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.10-4.15 -| 1.3.2 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.10-4.15 +| 1.3.0 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.12-4.15 +| 1.3.1 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.12-4.15 +| 1.3.2 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.12-4.15 +| 1.3.3 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.12-4.15 +| 1.3.4 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.12-4.15 +| 1.3.5 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.12-4.15 | 1.4.0 | link:https://{velero-domain}/docs/v1.14/[1.14] | 4.14-4.18 | 1.4.1 | link:https://{velero-domain}/docs/v1.14/[1.14] | 4.14-4.18 | 1.4.2 | link:https://{velero-domain}/docs/v1.14/[1.14] | 4.14-4.18 -|=== \ No newline at end of file +| 1.4.3 | link:https://{velero-domain}/docs/v1.14/[1.14] | 4.14-4.18 +|===