Skip to content

Commit 9bb6417

Browse files
skrthomasskrthomas
authored
Merge pull request #88886 from openshift-cherrypick-robot/cherry-pick-88238-to-enterprise-4.16
[enterprise-4.16] OADP-4884: Attributes for OADP 1.4.3
2 parents 9f8accf + 77909d6 commit 9bb6417

File tree

5 files changed

+20
-28
lines changed

5 files changed

+20
-28
lines changed

‎_attributes/common-attributes.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ endif::[]
3939
:oadp-first: OpenShift API for Data Protection (OADP)
4040
:oadp-full: OpenShift API for Data Protection
4141
:oadp-short: OADP
42-
:oadp-version: 1.4.2
43-
:oadp-version-1-3: 1.3.3
44-
:oadp-version-1-4: 1.4.2
42+
:oadp-version: 1.4.3
43+
:oadp-version-1-3: 1.3.5
44+
:oadp-version-1-4: 1.4.3
4545
:oadp-bsl-api: backupstoragelocations.velero.io
4646
:oc-first: pass:quotes[OpenShift CLI (`oc`)]
4747
:product-registry: OpenShift image registry

‎backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@ include::modules/oadp-supported-architecture.adoc[leveloffset=+1]
2121

2222
OpenShift API for Data Protection (OADP) is platform neutral. The information that follows relates only to {ibm-power-name} and to {ibm-z-name}.
2323

24-
* {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.
25-
* {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.
2624
* {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.
27-
* {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.
25+
* {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.
2826

2927

3028
include::modules/oadp-ibm-power-test-support.adoc[leveloffset=+2]

‎modules/oadp-ibm-power-test-support.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@
66
[id="oadp-ibm-power-test-matrix_{context}"]
77
= OADP support for target backup locations using {ibm-power-title}
88

9-
* {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.
10-
* {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.
119
* {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.
12-
* {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.
10+
* {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.

‎modules/oadp-ibm-z-test-support.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@
66
[id="oadp-ibm-z-test-support_{context}"]
77
= OADP testing and support for target backup locations using {ibm-z-title}
88

9-
* {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.
10-
* {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.
119
* {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.
12-
* {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.
10+
* {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.

‎modules/velero-oadp-version-relationship.adoc

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1+
// Module included in the following assemblies:
2+
//
3+
// backup_and_restore/application_backup_and_restore/installing/oadp-installing-operator.adoc
4+
// backup_and_restore/application_backup_and_restore/troubleshooting.adoc
5+
//
6+
17
:_mod-docs-content-type: CONCEPT
28
[id="velero-oadp-version-relationship_{context}"]
39
= OADP-Velero-{product-title} version relationship
410

511
[cols="3", options="header"]
612
|===
713
|OADP version |Velero version |{product-title} version
8-
| 1.1.0 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.9 and later
9-
| 1.1.1 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.9 and later
10-
| 1.1.2 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.9 and later
11-
| 1.1.3 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.9 and later
12-
| 1.1.4 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.9 and later
13-
| 1.1.5 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.9 and later
14-
| 1.1.6 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.11 and later
15-
| 1.1.7 | link:https://{velero-domain}/docs/v1.9/[1.9] | 4.11 and later
16-
| 1.2.0 | link:https://{velero-domain}/docs/v1.11/[1.11] | 4.11 and later
17-
| 1.2.1 | link:https://{velero-domain}/docs/v1.11/[1.11] | 4.11 and later
18-
| 1.2.2 | link:https://{velero-domain}/docs/v1.11/[1.11] | 4.11 and later
19-
| 1.2.3 | link:https://{velero-domain}/docs/v1.11/[1.11] | 4.11 and later
20-
| 1.3.0 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.10-4.15
21-
| 1.3.1 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.10-4.15
22-
| 1.3.2 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.10-4.15
14+
| 1.3.0 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.12-4.15
15+
| 1.3.1 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.12-4.15
16+
| 1.3.2 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.12-4.15
17+
| 1.3.3 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.12-4.15
18+
| 1.3.4 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.12-4.15
19+
| 1.3.5 | link:https://{velero-domain}/docs/v1.12/[1.12] | 4.12-4.15
2320
| 1.4.0 | link:https://{velero-domain}/docs/v1.14/[1.14] | 4.14-4.18
2421
| 1.4.1 | link:https://{velero-domain}/docs/v1.14/[1.14] | 4.14-4.18
2522
| 1.4.2 | link:https://{velero-domain}/docs/v1.14/[1.14] | 4.14-4.18
26-
|===
23+
| 1.4.3 | link:https://{velero-domain}/docs/v1.14/[1.14] | 4.14-4.18
24+
|===

0 commit comments

Comments
 (0)