Skip to content

Commit 3f74ed4

Browse files
authored
Merge pull request #70873 from anarnold97/OADP-3200-Upgrade-notes-section-repeated-line
OADP-3200: 1.2.0 Upgrade notes section has repeated line related rest…
2 parents dfee7f6 + 8c93d7d commit 3f74ed4

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

modules/oadp-converting-to-new-dpa-1-2-0.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ spec:
2222
configuration:
2323
velero:
2424
args:
25-
default-volumes-to-restic: true
25+
default-volumes-to-fs-backup: true
2626
default-restic-prune-frequency: 6000
27-
restic-timeout: 600
27+
fs-backup-timeout: 600
2828
# ...
2929
----
3030

modules/oadp-release-notes-1-2-0.adoc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,11 @@ Always upgrade to the next minor version. *Do not* skip versions. To update to a
6666

6767
The Velero server was updated from version 1.9 to 1.11.
6868

69-
In OADP 1.2, the `DataProtectionApplication` (DPA) configuration `spec.configuration.velero.args` has the following changes:
69+
In OADP 1.2, the `DataProtectionApplication` (DPA) configuration `dpa.spec.configuration.velero.args` has the following changes:
7070

71-
* The `default-volumes-to-restic` field was renamed to `default-volumes-to-fs-backup`. If you use `spec.velero`, you must add it again with the new name to your DPA after upgrading OADP.
71+
* The `default-volumes-to-restic` field was renamed to `default-volumes-to-fs-backup`. If you use `dpa.spec.configuration.velero.args`, you must add it again with the new name to your DPA after upgrading OADP.
7272

73-
* The `default-volumes-to-restic` field was renamed to `default-volumes-to-fs-backup`. If you use `spec.velero`, you must add it again with the new name to your DPA after upgrading OADP.
74-
75-
* The `restic-timeout` field was renamed to `fs-backup-timeout`. If you use `spec.velero`, you must add it again with the new name to your DPA after upgrading OADP.
73+
* The `restic-timeout` field was renamed to `fs-backup-timeout`. If you use `dpa.spec.configuration.velero.args`, you must add it again with the new name to your DPA after upgrading OADP.
7674

7775
* The `restic` daemon set was renamed to `node-agent`. OADP automatically updates the name of the daemon set.
7876

@@ -81,4 +79,4 @@ In OADP 1.2, the `DataProtectionApplication` (DPA) configuration `spec.configura
8179
* The custom resource definition `resticrepositories.velero.io` can be removed from the cluster.
8280

8381
[id="upgrade-steps-1-2-0_{context}"]
84-
=== Upgrading steps
82+
== Upgrading steps

0 commit comments

Comments
 (0)